Merging from trunk

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