merge
authorStefan Behnel <scoder@users.berlios.de>
Tue, 23 Dec 2008 14:04:25 +0000 (15:04 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 23 Dec 2008 14:04:25 +0000 (15:04 +0100)

Trivial merge