Merge pull request #2318 from gongzg:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Feb 2014 08:16:18 +0000 (12:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Feb 2014 08:16:19 +0000 (12:16 +0400)

Trivial merge