merged from trunk

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

svn path=/branches/proto/v4/tools/quickbook/; revision=49439
merged from trunk

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