Merge pull request #1230 from SpecLad:merge-2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 6 Aug 2013 16:54:29 +0000 (20:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 Aug 2013 16:54:30 +0000 (20:54 +0400)

Trivial merge