Merge pull request #2142 from KonstantinMatskevich:ocl_tapi_bfmatcher
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 24 Jan 2014 12:50:03 +0000 (16:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 24 Jan 2014 12:50:03 +0000 (16:50 +0400)

Trivial merge