Merge pull request #2641 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Apr 2014 08:01:03 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Apr 2014 08:01:03 +0000 (12:01 +0400)
commit4211d8fbd9de31e5e9c61728a25c7f3323f6e861
tree8278f5bc3ab875a14b2c5fc0d8400be15e5bc22d
parent6b986489ec78bf640ffb1d4e04e1e652d0efa4d7
parent4db12032dc61ef73a8df547c2e2bb6e524f71a58
Merge pull request #2641 from SpecLad:merge-2.4