merge from trunk to improved-restarter branch
Dave Rolsky [Thu, 7 May 2009 23:08:19 +0000 (23:08 +0000)]

No differences found