Merging from trunk

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