2009-08-12 cli Merge fix from sonews-1.0.