I've attached a branch that I believe should handle the first problem. The second problem i've filed as a separate bug against grub (bug 677758).
I've attached a branch that I believe should handle the first problem. The second problem i've filed as a separate bug against grub (bug 677758).