merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 25 Oct 2008 09:15:07 +0000 (11:15 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 25 Oct 2008 09:15:07 +0000 (11:15 +0200)

Trivial merge