Merge pull request #737 from AoD314:webp2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 3 Apr 2013 11:58:31 +0000 (15:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 3 Apr 2013 11:58:31 +0000 (15:58 +0400)

Trivial merge