merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 18 Jul 2008 08:19:40 +0000 (10:19 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 18 Jul 2008 08:19:40 +0000 (10:19 +0200)

Trivial merge