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

Trivial merge