Merge pull request #2356 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)
commitbcf4307345282572859bda676e51eb3b659f5ec9
tree42ad1e5248385e72f396461f2f638eb702ea1c39
parent9885a671ee819d0443a6dc62a3c8a204514405af
parent029ffb7c2d3916958404d4ebe7ed87c0d4444e6e
Merge pull request #2356 from SpecLad:merge-2.4