Merge pull request #2281 from vpisarev:ocl_surf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 5 Feb 2014 07:07:19 +0000 (11:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 5 Feb 2014 07:07:19 +0000 (11:07 +0400)

Trivial merge