merge
authorStefan Behnel <scoder@users.berlios.de>
Fri, 14 Jan 2011 08:01:26 +0000 (09:01 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 14 Jan 2011 08:01:26 +0000 (09:01 +0100)

Trivial merge