Merging from trunk

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