Merge commit 'immerda/master' into development
authorMarcel Haerry <haerry@puzzle.ch>
Tue, 13 May 2008 10:09:59 +0000 (12:09 +0200)
committerMarcel Haerry <haerry@puzzle.ch>
Tue, 13 May 2008 10:09:59 +0000 (12:09 +0200)

Trivial merge