Merging from trunk

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