merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 24 Feb 2009 13:28:11 +0000 (14:28 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 24 Feb 2009 13:28:11 +0000 (14:28 +0100)

Trivial merge