Merge pull request #2262 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 3 Feb 2014 11:33:40 +0000 (15:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 11:33:41 +0000 (15:33 +0400)

Trivial merge