Merge remote-tracking branch 'origin/master'
authormh <mh@immerda.ch>
Mon, 1 Aug 2011 10:05:20 +0000 (12:05 +0200)
committermh <mh@immerda.ch>
Mon, 1 Aug 2011 10:05:20 +0000 (12:05 +0200)

Trivial merge