Merge pull request #1257 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 14:42:17 +0000 (18:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 14:42:18 +0000 (18:42 +0400)

Trivial merge