Quickbook: Merge from trunk to quickbook-dev.

svn path=/branches/quickbook-dev/tools/auto_index/; revision=73239
Quickbook: Merge to quickbook-dev.

svn path=/branches/quickbook-dev/tools/auto_index/; revision=73983