Merge pull request #2819 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 2 Jun 2014 13:12:06 +0000 (17:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 2 Jun 2014 13:12:07 +0000 (17:12 +0400)
commitc836613bad1a485c51bb06e30331919f162e74c3
treea44dd2ba142628a1b74b05dce718e64cc23570db
parentfc2f79701d3301f5ac5d56c831e21e3794d401dc
parent33087f9eaa46dbd816f9076365e7c765bb31a83d
Merge pull request #2819 from SpecLad:merge-2.4