merged with github
authorMarcel Haerry <haerry@puzzle.ch>
Mon, 21 Jul 2008 14:42:16 +0000 (16:42 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Mon, 21 Jul 2008 14:42:16 +0000 (16:42 +0200)

Trivial merge