Merging from trunk

svn path=/branches/release/libs/exception/; revision=84745