Merge from trunk

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

svn path=/branches/bcbboost/tools/boostbook/; revision=39987