Merge pull request #622 from moshekaplan:python2_cleanups
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Mar 2013 17:14:20 +0000 (21:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Mar 2013 17:14:20 +0000 (21:14 +0400)

Trivial merge