From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Sat, 21 Nov 2009 17:06:06 +0000 (+0000)
Subject: Merge branch 'stable-5.x'
X-Git-Tag: 6.1^0
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=3a24aecf857292701d755173ffdb91d10a3426c8

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

3a24aecf857292701d755173ffdb91d10a3426c8