Bug#473996: promptconfaction should offer vimdiff too

Hi Guillem, > - There is a desire to get 3-way merge support. This is currently >just unreliable, as we do not keep all the information required. >I'd rather not spend time on this until the conffiledb work is >merged, which I just need to sit down and do. :) Is there an ETA on this,

Bug#610719: dpkg: [S-S-B] make start-stop-daemon find out the pid of forked processes

this patch would be really useful for daemons like udev that does not create the pidfile (bugs #791944 and #908796) ciao!