From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 3 Jun 2009 22:48:27 +0000 (+0100)
Subject: merge changes made accidentally to wrong copy
X-Git-Tag: 1.9.2~192
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;ds=sidebyside;h=24222363faec9b4e3d7074af2df5f39933613c7f;hp=24222363faec9b4e3d7074af2df5f39933613c7f;p=ypp-sc-tools.main.git

merge changes made accidentally to wrong copy
---