Merge pull request #801 from kirill-kornyakov:lkdemo-fix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 12 Apr 2013 10:59:11 +0000 (14:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 12 Apr 2013 10:59:11 +0000 (14:59 +0400)

Trivial merge