Merge pull request #2172 from Nerei:compilation_and_warnings
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sun, 19 Jan 2014 07:44:36 +0000 (11:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 19 Jan 2014 07:44:37 +0000 (11:44 +0400)

Trivial merge