Merge pull request #1204 from berak:Bug_3170
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 12:13:02 +0000 (16:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 12:13:03 +0000 (16:13 +0400)

Trivial merge