updates to make it consistent with modified files in tahoe and toolbox modules
Authored by: kyonten 2005-05-11
Parent: [r1173]
Child: [r1175]