Merge branch 'python-fixes'
authorAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Thu, 31 May 2012 16:23:29 +0000 (20:23 +0400)
committerAndrey Vlasovskikh <andrey.vlasovskikh@gmail.com>
Thu, 31 May 2012 16:23:29 +0000 (20:23 +0400)

Trivial merge