542067c Merge branch 'f18'

Merged and Committed by bruno 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	livecd-tools.spec
    
    The mass rebuild use a master branch that was behind the f18
    branch and prvented the more up to date f18 build from being
    inherited.
    
        
file modified
+6 -0
file modified
+53 -1
file modified
+1 -1