77ce7d7 Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnu-efi

Merged and Committed by pjones 12 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/gnu-efi
    
    Conflicts:
    	gnu-efi.spec
    
        
file modified
+10 -4