Merge pull request #2968 from LeonidBeynenson:bugfix_crash_gpu_feature_matcher_in_sti...
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 13:48:19 +0000 (13:48 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 29 Jul 2014 13:48:19 +0000 (13:48 +0000)

Trivial merge