[grub2: 4/4] Merge branch 'f18'

[Peter Jones]

commit 1f0786299efdf6ff4712d89864df55ff50e5e1f1
Merge: 724a4b1 4788033
Author: Peter Jones <pjones at redhat.com>
Date:   Tue Oct 23 10:50:43 2012 -0400

    Merge branch 'f18'
    
    Conflicts:
    	grub2.spec
    
    Signed-off-by: Peter Jones <pjones at redhat.com>

 grub-2.00-no-insmod-on-sb.patch |   73 ++++++++++++++++++++++++--------------
 grub2.spec                      |    5 ++-
 2 files changed, 50 insertions(+), 28 deletions(-)
---