Merging from trunk

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