Merging from trunk

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