Merge from trunk

svn path=/branches/bcbboost/tools/inspect/; revision=49055