6339653 Sync with F-12 branch: update to 2.1, re-enables webcam support.

Authored and Committed by alexlan 14 years ago
    Sync with F-12 branch: update to 2.1, re-enables webcam support.
    
        
file modified
+1 -1
file modified
+1 -1
file modified
+10 -4