merge of 0.9.6.10.1
authorStefan Behnel <scoder@users.berlios.de>
Tue, 1 Jan 2008 09:40:46 +0000 (10:40 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Tue, 1 Jan 2008 09:40:46 +0000 (10:40 +0100)

Trivial merge