Merge pull request #1081 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 5 Jul 2013 09:34:58 +0000 (13:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Jul 2013 09:34:59 +0000 (13:34 +0400)
commitde58039b46abd08ed15fdc1445d34b311f10a966
tree6b0c0481715cc55f7d8cc1315dd3f39292ef8c88
parent2f8be2a4b17bd056da0fc5cf951c69d1981b67be
parent4cf9990d4efc080dc898e1ecaa8861eb85c574fe
Merge pull request #1081 from SpecLad:merge-2.4