chiark / gitweb /
merge changes from --ubuntu branch
authorIan Jackson <ian@davenant.greenend.org.uk>
Thu, 25 Oct 2007 17:18:15 +0000 (18:18 +0100)
committerIan Jackson <ian@davenant.greenend.org.uk>
Thu, 25 Oct 2007 17:18:15 +0000 (18:18 +0100)

Trivial merge