* Merge from Debian unstable. * Remaining Ubuntu changes: - Update version in conflicts/replaces to that which was shipped in edgy, which was later than that in Debian (due to the ubuntuX). - Change default server to ntp.ubuntu.com. - Remove stop links from rc0 and rc6 - Call dh_installinit with --error-handler - Set Ubuntu maintainer address.