[grub2/f16: 20/20] Merge commit '8a04b0c2779cb35278360c9934835a0a49c42133' into f16

[Adam Williamson]

commit c7a4577e022889ddc8a5583d8bd3fe57d9314304
Merge: 3ba0d86 8a04b0c
Author: Adam Williamson <awilliam at redhat.com>
Date:   Fri Dec 9 09:29:12 2011 -0800

    Merge commit '8a04b0c2779cb35278360c9934835a0a49c42133' into f16
    
    Conflicts:
    	grub2.spec

 README.Fedora                       |   67 ++++++++++++++++++++++------------
 grub-1.99-fix_grub-probe_call.patch |   16 ++++++++
 grub.default                        |    7 ++++
 grub2-gfxpayload-efi.patch          |   63 ++++++++++++++++++++++++++++++++
 grub2.spec                          |   61 ++++++++++++++++++++++---------
 5 files changed, 172 insertions(+), 42 deletions(-)
---