Merge remote branch 'origin/master' into skytraq
authorKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 04:59:02 +0000 (20:59 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 04:59:02 +0000 (20:59 -0800)

Trivial merge