Merging from trunk

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