089461c Merge branch 'f14'

Merged and Committed by bruno 13 years ago
    Merge branch 'f14'
    
    Conflicts:
    	livecd-tools.spec
    
        
file modified
+5 -1