Merge branch 'alex'
authorWouter Verhelst <w@uter.be>
Tue, 17 May 2011 18:28:58 +0000 (20:28 +0200)
committerWouter Verhelst <w@uter.be>
Tue, 17 May 2011 18:28:58 +0000 (20:28 +0200)

Trivial merge