merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 14 Nov 2008 20:07:22 +0000 (21:07 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 14 Nov 2008 20:07:22 +0000 (21:07 +0100)

Trivial merge