Merge pull request #482 from vpisarev:c2cpp_imgproc_part2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Feb 2013 16:13:45 +0000 (20:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Feb 2013 16:13:45 +0000 (20:13 +0400)

Trivial merge