merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 23 May 2008 15:22:55 +0000 (17:22 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 23 May 2008 15:22:55 +0000 (17:22 +0200)

Trivial merge