Merge pull request #1811 from Nerei:fixed_some_build_errors
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 14:09:43 +0000 (18:09 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Nov 2013 14:09:44 +0000 (18:09 +0400)

Trivial merge