merged incoming
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 23 Apr 2012 19:24:09 +0000 (21:24 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 23 Apr 2012 19:24:09 +0000 (21:24 +0200)

Trivial merge