Merge commit '085441290'
authorWouter Verhelst <w@uter.be>
Tue, 17 May 2011 18:19:55 +0000 (20:19 +0200)
committerWouter Verhelst <w@uter.be>
Tue, 17 May 2011 18:19:55 +0000 (20:19 +0200)

Trivial merge