2009-07-01 chris sonews/0.5.1 fixes merged