Merge pull request #2699 from GregoryMorse:patch-1
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 13 May 2014 07:58:25 +0000 (11:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 13 May 2014 07:58:25 +0000 (11:58 +0400)

Trivial merge