merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 17 Jan 2009 10:59:28 +0000 (11:59 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 17 Jan 2009 10:59:28 +0000 (11:59 +0100)

Trivial merge