merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 5 Aug 2008 06:25:12 +0000 (08:25 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 5 Aug 2008 06:25:12 +0000 (08:25 +0200)

Trivial merge