merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 30 Nov 2010 13:13:54 +0000 (14:13 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 30 Nov 2010 13:13:54 +0000 (14:13 +0100)

Trivial merge