merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 19 Aug 2009 14:48:49 +0000 (16:48 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 19 Aug 2009 14:48:49 +0000 (16:48 +0200)

Trivial merge