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

Trivial merge