[grub2: 6/6] Merge commit '328405c9f5f69dd1f41d5c0a742ad64bd19698de'

[Adam Williamson]

commit a9b3287b0354ffe678970b141459550a6d161a9b
Merge: 3e87d77 328405c
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Oct 13 13:31:42 2011 -0700

    Merge commit '328405c9f5f69dd1f41d5c0a742ad64bd19698de'
    
    Conflicts:
    	grub2.spec

 grub2.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---