Merge pull request #2846 from alalek:2.4_fix_python_warnings
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 18 Jun 2014 13:19:11 +0000 (13:19 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 18 Jun 2014 13:19:11 +0000 (13:19 +0000)

Trivial merge