Merge pull request #1541 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 10:47:29 +0000 (14:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Oct 2013 10:47:30 +0000 (14:47 +0400)
commit60bcc52c4f3b859eb305b272149a4fce6dad7a1c
treefb4b490fcfea96ee402d5f47989dbc1fe7f3589d
parent4c7ecf20d808c79e3044f266fd419757a76d82ac
parent30d7e1c33d70f90507d66ddd129d978eb1128ac7
Merge pull request #1541 from SpecLad:merge-2.4