Merging from trunk

svn path=/branches/release/tools/boostbook/; revision=84745