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

Merge branch 'alex'
---

0da74c0820f6e28d9d79ac6ae2637a36c4ea27a7