merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=45289
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=45360
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=45844
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=47983
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=48605
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=49133
merged from trunk

svn path=/branches/proto/v4/tools/boostbook/; revision=49607