merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 23 Nov 2010 10:13:37 +0000 (11:13 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 23 Nov 2010 10:13:37 +0000 (11:13 +0100)

Trivial merge