c7a457 Merge commit '8a04b0c2779cb35278360c9934835a0a49c42133' into f16

Merged and Committed by adamwill 8 years ago
    Merge commit '8a04b0c2779cb35278360c9934835a0a49c42133' into f16
    
    Conflicts:
    	grub2.spec
    
        
file modified
+43 -24
file modified
+7 -0
file modified
+43 -18