Merge pull request #642 from taka-no-me:fix1
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Mar 2013 07:42:05 +0000 (11:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Mar 2013 07:42:05 +0000 (11:42 +0400)

Trivial merge