merge of 0.9.8.1 beta2
authorStefan Behnel <scoder@users.berlios.de>
Thu, 14 Aug 2008 09:58:38 +0000 (11:58 +0200)
committerStefan Behnel <scoder@users.berlios.de>
Thu, 14 Aug 2008 09:58:38 +0000 (11:58 +0200)

Trivial merge