merge of 0.9.6.8
authorStefan Behnel <scoder@users.berlios.de>
Fri, 9 Nov 2007 06:53:09 +0000 (07:53 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Fri, 9 Nov 2007 06:53:09 +0000 (07:53 +0100)

Trivial merge