Merge pull request #1559 from SpecLad:Wnull-conversion
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 4 Oct 2013 12:08:53 +0000 (16:08 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 4 Oct 2013 12:08:54 +0000 (16:08 +0400)

Trivial merge