[grub: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub

[Peter Jones]

commit a75c9c5f5b624dad93765b32b6d54769af673204
Merge: d0e1152 0ca5b07
Author: Peter Jones <pjones at redhat.com>
Date:   Thu Feb 16 11:46:19 2012 -0500

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub

 ...ll-back-to-old-efi-GOP-detection-behavior.patch |   46 --
 grub-fedora-16.patch => grub-fedora-17.patch       |  438 ++++++++++++++++----
 grub.spec                                          |   19 +-
 3 files changed, 368 insertions(+), 135 deletions(-)
---