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

Trivial merge