Merge pull request #1068 from AoD314:webp2
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 15 Jul 2013 07:45:28 +0000 (11:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 15 Jul 2013 07:45:28 +0000 (11:45 +0400)

Trivial merge