Merge pull request #523 from taka-no-me:fix_2815
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 22 Feb 2013 12:34:28 +0000 (16:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 22 Feb 2013 12:34:28 +0000 (16:34 +0400)

Trivial merge