Merge pull request #1942 from ilya-lavrenov:warn_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:26:43 +0000 (15:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:26:43 +0000 (15:26 +0400)

Trivial merge