Merge pull request #2031 from berak:b_flann_timer_30
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 3 Feb 2014 13:00:21 +0000 (17:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 13:00:21 +0000 (17:00 +0400)

Trivial merge