merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 22 Oct 2009 09:26:16 +0000 (11:26 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 22 Oct 2009 09:26:16 +0000 (11:26 +0200)

Trivial merge