merged master
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 25 Jun 2012 11:43:00 +0000 (13:43 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 25 Jun 2012 11:43:00 +0000 (13:43 +0200)
Change-Id: I0323bdbc035962a6ac8f9473df8a6b72acf82b4c


Trivial merge