Comment 5 for bug 797985

Uploaded to lucid-proposed, pending approval by another stable updates team member. Once that's done, to verify this while it's in lucid-proposed before it's promoted to lucid-updates, use the 'apt-setup/proposed=true' boot parameter to the installer.