Merge pull request #1198 from znah:py_flann_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 10:17:32 +0000 (14:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 10:17:33 +0000 (14:17 +0400)

Trivial merge