Merge pull request #1899 from berak:b_3171_24
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 3 Dec 2013 07:32:30 +0000 (11:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Dec 2013 07:32:31 +0000 (11:32 +0400)

Trivial merge