Merging from trunk

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