Merge pull request #1914 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 4 Dec 2013 12:30:55 +0000 (16:30 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Dec 2013 12:30:57 +0000 (16:30 +0400)
commit0736ede7e543f098dd76d12417f30c53cbeaef05
tree696e63de6a64fa0c0018e15b3d83d362060bad24
parentf9190cc66201afe501844ff29a7034e3e5642418
parentd58cd9851fdb592a395488fc5721d11c7436a99c
Merge pull request #1914 from SpecLad:merge-2.4