Merge pull request #2243 from ilya-lavrenov:ocl2trash
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 31 Jan 2014 15:08:26 +0000 (19:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 15:08:27 +0000 (19:08 +0400)

Trivial merge