[grub2: 21/22] Merge remote-tracking branch 'kiilerix/f17'

[Peter Jones]

commit f6b642dfbe5ce8c026af8c754d7297f2dcf4d477
Merge: a7c00b4 47b7f15
Author: Peter Jones <pjones at redhat.com>
Date:   Mon Jun 4 11:47:16 2012 -0400

    Merge remote-tracking branch 'kiilerix/f17'
    
    Conflicts:
    	grub2.spec

 README.Fedora                                      |   24 ++--
 grub-1.99-Fix-tests-of-zeroed-partition.patch      |   25 ---
 grub-1.99-grub_test_assert_printf.patch            |  167 --------------------
 grub-1.99-handle-fwrite-return.patch               |   59 -------
 grub-2.00-Add-fwsetup.patch                        |    4 +-
 grub-2.00-Dont-set-boot-on-ppc.patch               |   20 ++--
 grub-2.00-Fix-module-trampoline-for-ppc.patch      |  120 --------------
 grub-2.00-beta4-wronly.patch                       |   29 ----
 grub-2.00-ieee1276.patch                           |   16 ++
 grub-2.00-linux-mbr.patch                          |   82 ++++++++++
 grub-2.00-no-canon.patch                           |   29 ++++
 grub-2.00-no-huge-video.patch                      |   67 ++++++++
 grub-2.00-ppc-no-tree-scanning.patch               |   59 -------
 ...4-add-support-for-PowerMac-HFS-partitions.patch |   94 -----------
 grub2-2.0-no-png-in-texi.patch                     |   25 ---
 grub2-handle-initramfs-on-xen.patch                |   16 --
 grub2.spec                                         |   32 ++--
 17 files changed, 230 insertions(+), 638 deletions(-)
---