Merge pull request #1781 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 11 Nov 2013 15:15:25 +0000 (19:15 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Nov 2013 15:15:25 +0000 (19:15 +0400)
commitf461930d0760c454a194ea6c3b668f48cfe0bae2
tree607095d5b8fd4c1e9fc922f8902ebc486511d3c3
parent469d7eed72215615ff05e43c7f08d3b0a851f304
parentccbd7f8da9066649b081622ca8cdc341edcea6c9
Merge pull request #1781 from SpecLad:merge-2.4