Merge pull request #1389 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Sep 2013 15:42:06 +0000 (19:42 +0400)
commit009919872f6f15364e574afe032cfd702dddfcdb
tree0fae5b23f76bc4e3a36b1e14c72ec40d03480e65
parent79457f8f49ceb6f45533e2c52ebb80185ca3ac7f
parent18bb951574543fd634a6b98936779641740e4090
Merge pull request #1389 from SpecLad:merge-2.4