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

[Nicolas Chauvet]

commit 762c207b86ea4d257cbf69436b00c53c257c0830
Merge: 5bb3b71 981413b
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Mon Jun 4 23:56:41 2012 +0200

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

---