merge with lp:~mvo/apt/debian-sid