Merge pull request #2435 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)
commit7ecbf4575118f3c2ceb155ffb9dee4af145bccf0
tree90bf689907409860dffe5b547dbf17fbc2daa122
parent37580687e65931f8b0b730885c126867e5f17aee
parentdb85c35e696f223bf2e37c5e85be66c7e5a09700
Merge pull request #2435 from SpecLad:merge-2.4