Merge pull request #1156 from StevenPuttemans:bugfix_1873_new
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sun, 21 Jul 2013 14:46:58 +0000 (18:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 21 Jul 2013 14:46:58 +0000 (18:46 +0400)

Trivial merge