1f07862 Merge branch 'f18'

Merged and Committed by pjones 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	grub2.spec
    
    Signed-off-by: Peter Jones <pjones@redhat.com>
    
        
file modified
+46 -27
file modified
+4 -1