merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 25 Apr 2008 17:59:52 +0000 (19:59 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 25 Apr 2008 17:59:52 +0000 (19:59 +0200)

Trivial merge