merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 21 Nov 2010 08:36:49 +0000 (09:36 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 21 Nov 2010 08:36:49 +0000 (09:36 +0100)

Trivial merge