Merging from trunk

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