Merge pull request #2521 from atrebbi:#3620
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Mar 2014 14:54:00 +0000 (18:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Mar 2014 14:54:00 +0000 (18:54 +0400)

Trivial merge