Merge remote-tracking branch 'origin/diabolik/afterslime'
authormerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 20:04:46 +0000 (22:04 +0200)
committermerlijn <mhofstra@gmail.com>
Mon, 23 May 2011 20:04:46 +0000 (22:04 +0200)

Trivial merge