Merge pull request #2017 from pemmanuelviel:flannMemoryLeak
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 25 Dec 2013 15:36:49 +0000 (19:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Dec 2013 15:36:49 +0000 (19:36 +0400)

Trivial merge