Merge from trunk.

svn path=/branches/hash/tools/build/v2/; revision=39016
Merge from trunk.

svn path=/branches/hash/tools/build/v2/; revision=39287
Merge with the offending files removed.

svn path=/branches/hash/tools/build/v2/; revision=39995
Another merge.

svn path=/branches/hash/tools/jam/; revision=40001
Merge from trunk.

svn path=/branches/hash/tools/build/v2/; revision=40260