merge
authorStefan Behnel <scoder@users.berlios.de>
Thu, 26 Nov 2009 19:53:44 +0000 (20:53 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 26 Nov 2009 19:53:44 +0000 (20:53 +0100)

Trivial merge