From: Ian Jackson <ian@davenant.greenend.org.uk>
Date: Fri, 26 Oct 2007 17:13:28 +0000 (+0100)
Subject: merge from --ubuntu
X-Git-Tag: converted-from-bzr~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=36adaead53754daceaa30894ba52e5e4ca8d000c;p=autopkgtest.git

merge from --ubuntu
---

36adaead53754daceaa30894ba52e5e4ca8d000c