chiark / gitweb /
merge changes from --main branch, which aren't harmful atm
authorIan Jackson <ian@davenant.greenend.org.uk>
Thu, 25 Oct 2007 17:57:37 +0000 (18:57 +0100)
committerIan Jackson <ian@davenant.greenend.org.uk>
Thu, 25 Oct 2007 17:57:37 +0000 (18:57 +0100)

Trivial merge