Merge branch 'master' into crestline
authorKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 07:03:01 +0000 (23:03 -0800)
committerKeith Packard <keithp@neko.keithp.com>
Mon, 8 Jan 2007 07:03:01 +0000 (23:03 -0800)

Trivial merge