Merge pull request #1328 from SpecLad:zlib-update
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 23 Aug 2013 08:06:16 +0000 (12:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 23 Aug 2013 08:06:17 +0000 (12:06 +0400)

Trivial merge