6ecec5b Merge remote branch 'origin/master' into el5

Merged and Committed by robert 13 years ago
    Merge remote branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	libucil.spec
    	sources
    
        
file modified
+1 -1
file modified
+29 -3
file modified
+1 -1