chiark / gitweb /
merge from stable branch
authorIan Jackson <ian@anarres>
Thu, 17 May 2007 14:16:02 +0000 (15:16 +0100)
committerIan Jackson <ian@anarres>
Thu, 17 May 2007 14:16:02 +0000 (15:16 +0100)

Trivial merge