Merge pull request #351 from vpisarev:python_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jan 2013 09:34:50 +0000 (13:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 29 Jan 2013 09:34:50 +0000 (13:34 +0400)

Trivial merge