Merge pull request #2259 from ilya-lavrenov:ocl_surf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:24:36 +0000 (14:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 10:24:36 +0000 (14:24 +0400)

Trivial merge