Edward's latest checkins somehow managed to wipe out my previous latest
checkins.  Reapplying the latter changes.
2 files changed