Merge branch 'master' of ssh://pkgs.fedoraproject.org/opencv

Conflicts:
	opencv.spec
This commit is contained in:
Nicolas Chauvet 2012-06-04 23:56:41 +02:00
commit 762c207b86

Diff Content Not Available