[Merge] lp:~broder/ubuntu/natty/grub2/no-if-in-menuentry into lp:~ubuntu-core-dev/ubuntu/natty/grub2/natty

[Colin Watson]

Review: Needs Fixing
What about the case where they've explicitly set GRUB_GFXPAYLOAD_LINUX=keep?  That needs to call load_video too, I think.
-- 
https://code.launchpad.net/~broder/ubuntu/natty/grub2/no-if-in-menuentry/+merge/42075
Your team Ubuntu Core Development Team is subscribed to branch lp:~ubuntu-core-dev/ubuntu/natty/grub2/natty.