Merge proposals dependent on lp:kernel-setup-sh/trunk

lp:kernel-setup-sh/trunk has no merge proposals.