sync with plan 9
23 files changed