Merging from trunk

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