2009-08-20 cli Merging fixes from sonews/1.0.3