Merge pull request #2045 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)
commitfaddd5b97ff078d1aa9dfa42a6d4018498dc22c4
tree3c3dbcec22e00a2e863f32785620afb81c4c6a9a
parent0966e5ffa16f515f3156408c5c19e8c1ec075fa1
parent3c4b24d531663f42654c180f5fa0045b44be3486
Merge pull request #2045 from SpecLad:merge-2.4