Merge remote branch 'lavamind/master'
authormh <mh@immerda.ch>
Tue, 30 Nov 2010 00:26:19 +0000 (01:26 +0100)
committermh <mh@immerda.ch>
Tue, 30 Nov 2010 00:26:19 +0000 (01:26 +0100)

Trivial merge