* huge merge to bring the apt debian-sid and ubuntu branches as close