Merge pull request #973 from pengx17:2.4_oclclahe
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Jun 2013 14:17:56 +0000 (18:17 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Jun 2013 14:17:57 +0000 (18:17 +0400)

Trivial merge