[grub2/f17: 69/71] Merge branch 'master' into f17

[Peter Jones]

commit 85ef16307b7a0c49dea092bdd4eb9bb36bc15b5d
Merge: b9e7545 026ad9c
Author: Peter Jones <pjones at redhat.com>
Date:   Fri May 25 15:10:24 2012 -0400

    Merge branch 'master' into f17

 grub2.spec |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)
---