Merge pull request #2241 from asmorkalov:ocv_highgui_test_output_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 31 Jan 2014 10:56:10 +0000 (14:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 10:56:10 +0000 (14:56 +0400)

Trivial merge