merged BETA_JAVA7 into HEAD
4 files changed