Merge pull request #2480 from vpisarev:ocl_orb
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 14 Mar 2014 15:04:18 +0000 (19:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Mar 2014 15:04:19 +0000 (19:04 +0400)

Trivial merge