Merge pull request #1166 from StevenPuttemans:patch_2288
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 31 Jul 2013 11:50:12 +0000 (15:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 31 Jul 2013 11:50:13 +0000 (15:50 +0400)

Trivial merge