Merge pull request #2524 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 25 Mar 2014 08:13:03 +0000 (12:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 25 Mar 2014 08:13:04 +0000 (12:13 +0400)
commit85cf2d9671b1edad4cc70b3c2951c1979121a246
tree32942341087935f55caad35c77b4887098c0b5d5
parent9e1124d24ab0a807091be5e21b9437bc00130f6a
parentcc054937303dd90915569e9864f8618de9be51c3
Merge pull request #2524 from SpecLad:merge-2.4