merge
authorStefan Behnel <scoder@users.berlios.de>
Wed, 3 Nov 2010 10:08:27 +0000 (11:08 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Wed, 3 Nov 2010 10:08:27 +0000 (11:08 +0100)

Trivial merge