Merge pull request #371 from taka-no-me:fix_build
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 30 Jan 2013 11:06:19 +0000 (15:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Jan 2013 11:06:19 +0000 (15:06 +0400)

Trivial merge