[grub: 13/13] Merge commit 'fe980aaa272167e08c1637584e880ab05fd3b598'

[Adam Williamson]

commit 3f75e961ec42d1840206b77992bf4f87b314ade0
Merge: 8ec8960 fe980aa
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Oct 13 13:48:29 2011 -0700

    Merge commit 'fe980aaa272167e08c1637584e880ab05fd3b598'
    
    Conflicts:
    	grub.spec

 ...ll-back-to-old-efi-GOP-detection-behavior.patch |   46 ++++++++++++++++++++
 0001-Fix-strange-compilation-problem.patch         |   31 +++++++++++++
 grub.spec                                          |   45 ++++++++++++++++++-
 3 files changed, 119 insertions(+), 3 deletions(-)
---