Merge pull request #1334 from MarkBelmont:bugfix_1
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 23 Aug 2013 12:49:51 +0000 (16:49 +0400)

Trivial merge