merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 9 May 2008 05:39:21 +0000 (07:39 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 9 May 2008 05:39:21 +0000 (07:39 +0200)

Trivial merge