From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 19 Aug 2009 20:07:43 +0000 (+0100)
Subject: Merge branch 'stable-3.x'
X-Git-Tag: 3.4~167
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=608bc9e07b5c8a961325fd1b8d5b92f65418b949

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

608bc9e07b5c8a961325fd1b8d5b92f65418b949