Merge pull request #305 from stephenfalken:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 14:24:36 +0000 (18:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 14:24:36 +0000 (18:24 +0400)
commit94e2b5c140c950275fbff837151fad4c722c0485
tree2c98b12acd110581f2e2b78b9b6c8488f34027c1
parent7ad81ed46fe995390ea9a443d0e87442c33daac5
parent195d501b439a188ba3c13e877a81f96e683b6c1f
Merge pull request #305 from stephenfalken:2.4