chiark / gitweb /
merge changes and wip from --ubuntu branch
authorIan Jackson <ian@davenant.greenend.org.uk>
Tue, 2 Oct 2007 17:16:56 +0000 (18:16 +0100)
committerIan Jackson <ian@davenant.greenend.org.uk>
Tue, 2 Oct 2007 17:16:56 +0000 (18:16 +0100)

Trivial merge