commit e2315d79698a66af3b6cf0ae1dabb1406ac44ed7 Merge: 63417b0 cb41a17 Author: Peter Jones <pjones at redhat.com> Date: Wed Jun 29 14:45:30 2011 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/grub ---