merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 19 Nov 2008 07:03:09 +0000 (08:03 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 19 Nov 2008 07:03:09 +0000 (08:03 +0100)

Trivial merge