[grub2/f17] Fix merge error on /etc/default/grub ownership, and add IBM bug number.

[Peter Jones]

commit 31ad4e0c341bfa061b1b1e81bc28c9cc8409dd86
Author: Peter Jones <pjones at redhat.com>
Date:   Thu May 10 18:05:33 2012 -0400

    Fix merge error on /etc/default/grub ownership, and add IBM bug number.

 grub2.spec |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/grub2.spec b/grub2.spec
index bba03e5..444a5fa 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -370,7 +370,7 @@ fi
 %config %{_sysconfdir}/grub.d/??_*
 %{_sysconfdir}/grub.d/README
 %config(noreplace) %{_sysconfdir}/grub2-efi.cfg
-%config(noreplace) %{_sysconfdir}/default/grub
+%ghost %config(noreplace) %{_sysconfdir}/default/grub
 %{_sysconfdir}/sysconfig/grub
 %ghost %config(noreplace) /boot/efi/EFI/redhat/grub2-efi/grub.cfg
 %doc grub-%{tarversion}/COPYING grub-%{tarversion}/INSTALL
@@ -388,7 +388,8 @@ fi
 * Thu May 10 2012 Peter Jones <pjones at redhat.com> - 2.0-0.26.beta5
 - Fix license of theme (mizmo)
   Resolves: rhbz#820713
-- Fix some unfiled IBM problem.
+- Fix some PPC bootloader detection IBM problem
+  Resolves: rhbz#820722
 
 * Wed May 09 2012 Peter Jones <pjones at redhat.com> - 2.0-0.25.beta4
 - Include theme support (mizmo)