merge with debian-sid (some version screw going on here)