Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into...
authorPeng Xiao <pengxiao@outlook.com>
Sat, 13 Apr 2013 06:09:21 +0000 (14:09 +0800)
committerPeng Xiao <pengxiao@outlook.com>
Sat, 13 Apr 2013 06:09:21 +0000 (14:09 +0800)

Trivial merge