merge
authorStefan Behnel <scoder@users.berlios.de>
Mon, 28 Apr 2008 08:49:25 +0000 (10:49 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Mon, 28 Apr 2008 08:49:25 +0000 (10:49 +0200)

Trivial merge