Merge from trunk

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

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

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

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