chiark / gitweb /
Merge branch 'master' into stable-6.x
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Sep 2010 18:52:34 +0000 (19:52 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Sun, 12 Sep 2010 18:52:34 +0000 (19:52 +0100)

Trivial merge