7d61a12 Merge commit '092440402b0066e00c47e5b04597f2ac805ee782' into f19

Merged and Committed by karsten 10 years ago
    Merge commit '092440402b0066e00c47e5b04597f2ac805ee782' into f19
    
    Conflicts:
    	libcap.spec
    
        
file added
+23
file modified
+33 -19