Merge pull request #4111 from mshabunin:fix-flann-access
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Jun 2015 11:53:32 +0000 (11:53 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Jun 2015 11:53:32 +0000 (11:53 +0000)

Trivial merge