Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 10:49:36 +0000 (14:49 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 23 Jan 2013 10:50:29 +0000 (14:50 +0400)

Trivial merge