Merge pull request #2669 from Adil-Ibragimov:flann_distance_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 7 Jul 2014 13:35:08 +0000 (13:35 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 7 Jul 2014 13:35:09 +0000 (13:35 +0000)

Trivial merge