Merge pull request #391 from taka-no-me:fix_buildbot_issues
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 31 Jan 2013 14:55:09 +0000 (18:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 31 Jan 2013 14:55:09 +0000 (18:55 +0400)

Trivial merge