e7161b5 Merge remote-tracking branch 'origin/f16' into f17

Merged and Committed by drago01 12 years ago
    Merge remote-tracking branch 'origin/f16' into f17
    
    Conflicts:
    	.gitignore
    	pigz.spec
    	sources
    
        
file modified
+1 -0
file modified
+4 -1
file modified
+1 -1