[mactel-boot/f18: 9/10] Merge branch 'f17' into f18

[Matthew Garrett]

commit d6c490b5219cb040af823163221e1faf0cda519a
Merge: 3d292e2 f067328
Author: Matthew Garrett <mjg at redhat.com>
Date:   Thu Sep 6 17:22:47 2012 -0400

    Merge branch 'f17' into f18
    
    Conflicts:
    	mactel-boot.spec

 mactel-boot-setup |   26 ++++++++++++++++++++++++++
 mactel-boot.spec  |   53 ++++++++++++++++++++++++++++-------------------------
 2 files changed, 54 insertions(+), 25 deletions(-)
---