Merge pull request #3239 from mshabunin:xfeatures2d_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Sep 2014 15:28:42 +0000 (15:28 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Sep 2014 15:28:42 +0000 (15:28 +0000)

Trivial merge