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

Trivial merge