[Merge] lp:~brian-murray/ubuntu/oneiric/apport/conffile-handling into lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu

[Brian Murray]

I've updated the branch but did not implement the i18n bit as I think this would be an inconsistent experience for the reporter as source package hooks calls to ui are not translated.
-- 
https://code.launchpad.net/~brian-murray/ubuntu/oneiric/apport/conffile-handling/+merge/68477
Your team Ubuntu Core Development Team is subscribed to branch lp:~ubuntu-core-dev/ubuntu/oneiric/apport/ubuntu.