Merge pull request #2211 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 28 Jan 2014 08:44:29 +0000 (12:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 28 Jan 2014 08:44:29 +0000 (12:44 +0400)
commit84c29745f2908c5fe4db57754ebdd0b063124141
treecc5d28185bbe659b24ed33098c4be5d0374cf3ec
parent6deda99f0748c8eaa851efed6e67b49df7b284c3
parentbbc35d609d5613c73c9597502f13ceeb97dc769b
Merge pull request #2211 from SpecLad:merge-2.4