Merge pull request #2796 from berak:b_3674_24
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)

Trivial merge