Merge in some changes from trunk

svn path=/branches/bitten/tools/boostbook/; revision=41340