merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 29 Jan 2011 08:55:04 +0000 (09:55 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 29 Jan 2011 08:55:04 +0000 (09:55 +0100)

Trivial merge