nix: sync with plan 9
R=nixiedev, quanstroCC=nix-devhttp://codereview.appspot.com/5977045
Committer: Francisco J Ballesteros <nemo...@gmail.com>
http://codereview.appspot.com/5977045/