Merge pull request #2486 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Mar 2014 09:55:56 +0000 (13:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Mar 2014 09:55:57 +0000 (13:55 +0400)
commitae2b0b0098824091a516dc62a59460ba1f85ac9d
treeea9e9362b92cb020da6dc8a8a396cee7111e1d07
parentdc28451b8ac6abcf636565104e379898bf2a76a6
parent40a740ff88b0a0a0d7554ff32870fb3f1e3cf127
Merge pull request #2486 from SpecLad:merge-2.4