merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 28 Nov 2008 07:47:37 +0000 (08:47 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 28 Nov 2008 07:47:37 +0000 (08:47 +0100)

Trivial merge