Merge pull request #668 from AoD314:webp2
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 19 Mar 2013 15:38:52 +0000 (19:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 19 Mar 2013 15:38:52 +0000 (19:38 +0400)

Trivial merge