2009-08-20Merging fixes from sonews/1.0.3
cli [Thu, 20 Aug 2009 14:31:19 +0200] rev 12
Merging fixes from sonews/1.0.3