Merge pull request #1874 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 28 Nov 2013 12:42:53 +0000 (16:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 28 Nov 2013 12:43:00 +0000 (16:43 +0400)
commit9ca80961fd61254cccdae98a837e77ae059fd2ac
tree5791f9d5e6b600d226908f1b59fb6df4d3b6286c
parent41ae5d5f66eec1843f17d3ef87d6e508f449ef4d
parent2fed6683904ea1092a20d917981a08fb890790bf
Merge pull request #1874 from SpecLad:merge-2.4