merged from trunk

svn path=/branches/proto/v4/boost/ptr_container/; revision=49607