Merging from trunk

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