merged from trunk

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