Merging from trunk

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