Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 15 Apr 2013 08:12:17 +0000 (12:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 15 Apr 2013 08:12:18 +0000 (12:12 +0400)

Trivial merge