Comment 2 for bug 399282

Logfile was truncated so I cannot investigate this. It sounds like the usual three-way-merge failure ? Please reopen the bug if you can reproduce it on subsequent upgrades and post the corresponding dpkg logfiles.