From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 14 Nov 2009 17:29:52 +0000 (+0000)
Subject: Merge branch 'stable-5.x'
X-Git-Tag: 6.0~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=commitdiff_plain;h=c98eb3b0720f8194a116aea338fd2d3caa8c7538;p=ypp-sc-tools.main.git

Merge branch 'stable-5.x'
---

c98eb3b0720f8194a116aea338fd2d3caa8c7538