merge
authorStefan Behnel <scoder@users.berlios.de>
Mon, 25 Feb 2008 05:54:57 +0000 (06:54 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Mon, 25 Feb 2008 05:54:57 +0000 (06:54 +0100)

Trivial merge