Merging from trunk

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