Comment 6 for bug 708172

Given Clint's comments on irc about upstream's plans, I think it would be best to merge this fix right now for natty, SRU it for maverick and lucid, and switch to the upstream solution when upstart override files become available. I'm going to propose my branch for merge, and let the fur fly :)