merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 21 Feb 2009 17:24:42 +0000 (18:24 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 21 Feb 2009 17:24:42 +0000 (18:24 +0100)

Trivial merge