Merge pull request #1581 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 9 Oct 2013 08:33:49 +0000 (12:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Oct 2013 08:33:50 +0000 (12:33 +0400)
commitdfb698dc6416d1bc89e7f375c7837addb82093ad
tree330539f66b7e94b3cb9cc1e636e64c8159adbbd0
parent685eceb68ade4b579cdce7cb41e9888e274a7093
parent076eeffd4d63264301735bc813d27cc82fe419d8
Merge pull request #1581 from SpecLad:merge-2.4