Merge commit 'origin/master'
authorReinhard Pfau <Reinhard.Pfau@gmx.de>
Wed, 29 Apr 2009 18:52:38 +0000 (20:52 +0200)
committerReinhard Pfau <Reinhard.Pfau@gmx.de>
Wed, 29 Apr 2009 18:52:38 +0000 (20:52 +0200)

Trivial merge