merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 31 Jul 2008 06:23:40 +0000 (08:23 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 31 Jul 2008 06:23:40 +0000 (08:23 +0200)

Trivial merge