merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 9 Mar 2010 08:32:00 +0000 (09:32 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 9 Mar 2010 08:32:00 +0000 (09:32 +0100)

Trivial merge