Merge from trunk

svn path=/branches/bcbboost/tools/quickbook/; revision=39533
Merge from trunk

svn path=/branches/bcbboost/tools/quickbook/; revision=49055