Merge remote-tracking branch 'puzzle/master'
authormh <mh@immerda.ch>
Tue, 6 Sep 2011 20:51:29 +0000 (22:51 +0200)
committermh <mh@immerda.ch>
Tue, 6 Sep 2011 20:51:29 +0000 (22:51 +0200)

Trivial merge