Merge branch 'origin'
authorKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 07:00:48 +0000 (23:00 -0800)
committerKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 07:00:48 +0000 (23:00 -0800)

Trivial merge