merged with upstream
authorMarcel Haerry <haerry@puzzle.ch>
Tue, 29 Apr 2008 08:00:06 +0000 (10:00 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Tue, 29 Apr 2008 08:00:06 +0000 (10:00 +0200)

Trivial merge