merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 30 Nov 2008 05:07:03 +0000 (06:07 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 30 Nov 2008 05:07:03 +0000 (06:07 +0100)

Trivial merge