From: Ian Jackson <ian@turbine>
Date: Thu, 9 Oct 2008 23:32:21 +0000 (+0100)
Subject: merge
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=c87e982d2102c4276f22429a47d09c59b993f41e;p=moebius2.git

merge
---

c87e982d2102c4276f22429a47d09c59b993f41e