Merge pull request #2636 from atrebbi:#3653
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 5 May 2014 14:00:17 +0000 (18:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 May 2014 14:00:18 +0000 (18:00 +0400)

Trivial merge