f6b642d Merge remote-tracking branch 'kiilerix/f17'

Merged and Committed by pjones 9 years ago
    Merge remote-tracking branch 'kiilerix/f17'
    
    Conflicts:
    	grub2.spec
    
        
file modified
+10 -14
file modified
+2 -2
file modified
+14 -18