local merge
authorStefan Behnel <scoder@users.berlios.de>
Sat, 19 Jan 2008 13:03:10 +0000 (14:03 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 19 Jan 2008 13:03:10 +0000 (14:03 +0100)

Trivial merge