Merge from trunk

svn path=/branches/bcbboost/tools/build/; revision=39768
Merge from trunk

svn path=/branches/bcbboost/tools/build/; revision=39987
Merge from trunk

svn path=/branches/bcbboost/tools/build/; revision=49055
Merge from trunk

svn path=/branches/bcbboost/tools/build/; revision=49100
Merge from trunk

svn path=/branches/bcbboost/tools/build/; revision=49113