merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 27 Nov 2008 13:31:06 +0000 (14:31 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 27 Nov 2008 13:31:06 +0000 (14:31 +0100)

Trivial merge