merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 4 Dec 2008 20:08:56 +0000 (21:08 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 4 Dec 2008 20:08:56 +0000 (21:08 +0100)

Trivial merge