Merge remote-tracking branch 'puzzle/master'
authormh <mh@immerda.ch>
Fri, 5 Aug 2011 20:55:05 +0000 (22:55 +0200)
committermh <mh@immerda.ch>
Fri, 5 Aug 2011 20:55:05 +0000 (22:55 +0200)

Trivial merge