chiark / gitweb /
merge new features and fixes from development branch
authorIan Jackson <ian@davenant.greenend.org.uk>
Tue, 3 Jul 2007 14:02:18 +0000 (15:02 +0100)
committerIan Jackson <ian@davenant.greenend.org.uk>
Tue, 3 Jul 2007 14:02:18 +0000 (15:02 +0100)

Trivial merge