Merge pull request #1172 from StevenPuttemans:bugfix_3166_24
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 30 Jul 2013 14:39:41 +0000 (18:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 30 Jul 2013 14:39:41 +0000 (18:39 +0400)

Trivial merge