Merging from trunk

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