Merge pull request #1589 from ilya-lavrenov:pr1582_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 9 Oct 2013 12:47:59 +0000 (16:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Oct 2013 12:47:59 +0000 (16:47 +0400)

Trivial merge