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

Merge commit '085441290'
---

ed6972c780c076bbb33d599905b151c147bdeba4