From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Thu, 25 Oct 2007 17:57:37 +0000 (+0100)
Subject: merge changes from --main branch, which aren't harmful atm
X-Git-Tag: converted-from-bzr~14^2~3
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=4293cd4965b27fa0e86ece2daf4cdea45c989e0c;p=autopkgtest.git

merge changes from --main branch, which aren't harmful atm
---

4293cd4965b27fa0e86ece2daf4cdea45c989e0c