From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Thu, 20 Aug 2009 00:54:29 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 3.4~161
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=commitdiff_plain;h=fd6bf359d9051fe0c6d269a44bcc08cc53aa2fea

Merge branch 'stable-3.x'
---

fd6bf359d9051fe0c6d269a44bcc08cc53aa2fea