Merge pull request #1170 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 24 Jul 2013 09:45:32 +0000 (13:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 24 Jul 2013 09:45:33 +0000 (13:45 +0400)
commitb2d359b6ac0784dcae62bb7b516be90bde0683ad
tree863cba3a11a482fca71162a701bac3ec12217e15
parentef91d7e8830c36785f0b6fdbf2045da48413dd76
parent3939d783362a252e4e43e81db9c1dfb3e8c78217
Merge pull request #1170 from SpecLad:merge-2.4