From: Wouter Verhelst <w@uter.be>
Date: Sat, 28 May 2011 08:47:21 +0000 (+0200)
Subject: Merge branch 'alex'
X-Git-Url: http://git.alex.org.uk

Merge branch 'alex'
---

e01d085faf2221aa00f50a47cf84f5c47fcd8e82