merge from --ubuntu

diff --combined debian/changelog
index 495ea322d78a700ebb3e5cf5a55d5f968f7be616,38cd3e5ccd0ddc22dba3ce912efdd522226b02c6..e9c2680c2768aeb70b4542ae1b8a805553530272
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,3 +1,13 @@@
 +autopkgtest (1.2.0~) unstable; urgency=low
 +
 +  * adt-xenlvm-*: support for swap, defaulting to 5G.
 +    This will break existing setups with insufficient LVM space.
 +  * adt-xenlvm-*: allow specification of LVM PVs to use.
 +  * remove spurious mkdir of empty variable $snap.
 +  * hosts/magrathea/*: working setup.
 +
 + -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 26 Oct 2007 17:33:40 +0100
 +
  autopkgtest (1.1.1~) unstable; urgency=low
  
    * adt-xenlvm-setup: new hooks for xmdomain config file.
@@@ -16,8 -6,12 +16,12 @@@
      information after some whitespace
    * adt-openbugs-*: new machinery for working with debbugs.
    * hosts/magrathea/*: work-in-progress configuration
+   * Add Recommends against apt-utils.
+   * hosts/cadmium/crontab: savelog -c7 not savelog -n7
+   * hosts/{cadmium,chinstrap}/crontab: set MAILTO
+   * adt-testreport-cronjob: make executable.
  
-  -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 26 Oct 2007 14:57:49 +0100
+  --
  
  autopkgtest (1.1.0) unreleased; urgency=low