Fixup for bug 948275 fixing windows bustage and avoiding a forced clobber. r=gps