Merging from trunk

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