Merge pull request #1096 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 9 Jul 2013 07:50:19 +0000 (11:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 9 Jul 2013 07:50:19 +0000 (11:50 +0400)
commit68a992b075276972b69bf6a78017cecd7085d8d3
treecdd4cf6db74d792ca21a47090b723e8266fc2866
parentde58039b46abd08ed15fdc1445d34b311f10a966
parentc05bfe9d6d73fae5181218b881d64b5c2f268785
Merge pull request #1096 from SpecLad:merge-2.4