Merge pull request #1371 from HapeMask:fix-png-warnings
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 30 Aug 2013 13:56:06 +0000 (17:56 +0400)

Trivial merge