merge from github
authormh <mh@immerda.ch>
Tue, 10 Apr 2012 12:57:32 +0000 (14:57 +0200)
committermh <mh@immerda.ch>
Tue, 10 Apr 2012 12:57:32 +0000 (14:57 +0200)

No differences found