Merge pull request #600 from taka-no-me:fix_build_warnings
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 1 Mar 2013 13:09:56 +0000 (17:09 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 1 Mar 2013 13:09:56 +0000 (17:09 +0400)

Trivial merge