Merge pull request #392 from vpisarev:python_fixes2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Feb 2013 06:20:51 +0000 (10:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Feb 2013 06:20:52 +0000 (10:20 +0400)

Trivial merge