Merge pull request #2792 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)
commit68165b1af0f515b0972afdfbf321a9b50f372a1f
treeff63a7f689b806e739d94fdca4155f18cc1d9210
parentab2749d648b2792d332028d378cf7334498e517c
parent0a2d22bf3156833cae618978e4f1658f1cc89b36
Merge pull request #2792 from SpecLad:merge-2.4