From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 15 Jun 2008 13:58:12 +0000 (+0100)
Subject: Merge from 4.0 branch
X-Git-Tag: 4.1~16
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/17fd85ca97da590ec0092821597eefd7adee0fc2

Merge from 4.0 branch
---

17fd85ca97da590ec0092821597eefd7adee0fc2