Merge pull request #2698 from GregoryMorse:patch-2
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 May 2014 10:52:58 +0000 (14:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 May 2014 10:52:58 +0000 (14:52 +0400)

Trivial merge