Merge pull request #1230 from SpecLad:merge-2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 6 Aug 2013 16:54:29 +0000 (20:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 6 Aug 2013 16:54:30 +0000 (20:54 +0400)
commitab4fe8dd2c51e4ae131f100146043ab7e6c39998
tree64c269a6d9d1091e12440e2ccd87139adda393c8
parent4c03afe0064d6619a1aa2f89ad59412218fa352f
parent48a6edbdfe48fb5fcf0431aaa0c1dbed34d71993
Merge pull request #1230 from SpecLad:merge-2.4