[grub2: 3/3] Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2

[Peter Jones]

commit 06628ab4593c5e215d68e5404e8410e3683a282d
Merge: 62a7c9b 1a635d8
Author: Peter Jones <pjones at redhat.com>
Date:   Wed Mar 7 09:12:41 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2
    
    Conflicts:
    	grub2.spec

 grub2.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --cc grub2.spec
index 78cdc1f,ce22b97..8dc5b77
--- a/grub2.spec
+++ b/grub2.spec
@@@ -18,7 -18,7 +18,11 @@@
  Name:           grub2
  Epoch:          1
  Version:        1.99
++<<<<<<< HEAD
 +Release:        17%{?dist}
++=======
+ Release:        16%{?dist}
++>>>>>>> 1a635d813d926deec0473bd906f46b1fbcb2e0b8
  Summary:        Bootloader with support for Linux, Multiboot and more
  
  Group:          System Environment/Base
@@@ -373,14 -367,6 +377,12 @@@ f
  %endif
  
  %changelog
 +* Tue Mar 06 2012 Peter Jones <pjones at redhat.com> - 1.99-17
 +- Add /etc/sysconfig/grub link to /etc/default/grub
 +  Resolves: rhbz#800152
- 
- * Tue Mar 06 2012 Peter Jones <pjones at redhat.com> - 1.99-16
 +- ExcludeArch s390*, which is not supported by this package.
 +  Resolves: rhbz#758333
 +
  * Fri Feb 17 2012 Orion Poplawski <orion at cora.nwra.com> - 1:1.99-16
  - Build with -Os (bug 782144)