Merge pull request #954 from LeszekSwirski:24_fix-qtwindow
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 19 Jun 2013 13:01:57 +0000 (17:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 19 Jun 2013 13:01:57 +0000 (17:01 +0400)

Trivial merge