Merging from trunk

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