chiark / gitweb /
Merge branch 'master' into stable-5.x 5.0
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 25 Oct 2009 12:24:52 +0000 (12:24 +0000)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 25 Oct 2009 12:24:52 +0000 (12:24 +0000)

Trivial merge