changes from plan 9.

Reference: /n/patches.lsub.org/patch/plan9-20120601
Date: Mon Jun  4 11:33:54 CES 2012
Signed-off-by: nemo@lsub.org