Merge pull request #2580 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)
commit6f055d7a7652def0baf6f8b8281d10e810c7867c
tree8992490b4870e4d726e301e756cf192abf5e7524
parentf690440533c42f2a1bb1897a30d0a89531787b59
parent4f2b126b7bebbaf3d093baa08894dd02e71639d5
Merge pull request #2580 from SpecLad:merge-2.4