merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 3 Aug 2008 13:01:29 +0000 (15:01 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 3 Aug 2008 13:01:29 +0000 (15:01 +0200)

Trivial merge