Merge pull request #2616 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 15 Apr 2014 08:06:12 +0000 (12:06 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 15 Apr 2014 08:06:13 +0000 (12:06 +0400)
commit534f9623f2be6f2479a514a8762720ed55b25826
tree4198e5bb0c39f2bb4c4f2ee99144b6f70120ad35
parent8176e893c0edd3156adb5b249072608fd9945210
parent799d2dabd680b1ccc4b7c5259fb7565a7612c383
Merge pull request #2616 from SpecLad:merge-2.4