Merge pull request #1996 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 17 Dec 2013 09:21:47 +0000 (13:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 09:21:48 +0000 (13:21 +0400)

Trivial merge