Merge pull request #2675 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 09:51:44 +0000 (13:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Apr 2014 09:51:44 +0000 (13:51 +0400)
commitc6e91e4736cadc610bf6b27666aa68f732af94a1
treeeda2066c58a58d0d76bd4374436700bb3913add5
parent86ec0fc813dd74ea17fdd6c6186e132477a046bc
parent47d903d9687477f99e0b19e691ea57b03344a24c
Merge pull request #2675 from SpecLad:merge-2.4