commit b968422f51732c492ff4081786b713ace99835c1
from: Russ Cox <rsc@swtch.com>
date: Mon Jan 04 04:44:09 2010 UTC

merge

commit - 6530d37d7f3f6d00527a71ba8a02c536c28b5d9f
commit + b968422f51732c492ff4081786b713ace99835c1