commit 7374fca6aa4b7ab00681319477115337e8ef5da9 Merge: 982cdee eec0f81 Author: Peter Jones <pjones at redhat.com> Date: Thu Mar 29 13:45:45 2012 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub2 ---