chiark / gitweb /
Merge branch 'stable-3.x'
authorIan Jackson <ian@liberator.relativity.greenend.org.uk>
Fri, 11 Sep 2009 22:44:57 +0000 (23:44 +0100)
committerIan Jackson <ian@liberator.relativity.greenend.org.uk>
Fri, 11 Sep 2009 22:44:57 +0000 (23:44 +0100)

Trivial merge