Merging from trunk

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