Merge pull request #831 from jet47:fix-build
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Apr 2013 12:50:46 +0000 (16:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 17 Apr 2013 12:50:47 +0000 (16:50 +0400)

Trivial merge