Merge pull request #1139 from StevenPuttemans:bugfix_3101
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 31 Jul 2013 11:14:03 +0000 (15:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 31 Jul 2013 11:14:03 +0000 (15:14 +0400)

Trivial merge