merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 23 Feb 2010 14:27:59 +0000 (15:27 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 23 Feb 2010 14:27:59 +0000 (15:27 +0100)

Trivial merge