Merge pull request #2264 from alalek:bug_fix_3470
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 13:31:57 +0000 (17:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 13:31:57 +0000 (17:31 +0400)

Trivial merge