5505d34 Merge branch 'f18'

Merged and Committed by pjones 8 years ago
    Merge branch 'f18'
    
    Conflicts:
    	grub2.spec
    
        
file modified
+8 -2