Merging from trunk

svn path=/branches/release/tools/build/; revision=84745