Merge commit 'origin/master'
authormh <mh@immerda.ch>
Tue, 2 Jun 2009 09:52:30 +0000 (11:52 +0200)
committermh <mh@immerda.ch>
Tue, 2 Jun 2009 09:52:30 +0000 (11:52 +0200)

Trivial merge