downstream merge
authorStefan Behnel <scoder@users.berlios.de>
Sun, 3 Feb 2008 19:55:58 +0000 (20:55 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sun, 3 Feb 2008 19:55:58 +0000 (20:55 +0100)

Trivial merge