Merging from trunk

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