From: Wouter Verhelst <w@uter.be>
Date: Tue, 27 Jul 2010 22:54:37 +0000 (-0400)
Subject: Merge branch 'master' into names
X-Git-Url: http://git.alex.org.uk

Merge branch 'master' into names
---

5bf91a81e108bc5404b698b257f98880ff437d50