Merge remote branch 'origin/master' 0.6
authorKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 23:47:40 +0000 (15:47 -0800)
committerKeith Packard <keithp@keithp.com>
Mon, 2 Nov 2009 23:47:40 +0000 (15:47 -0800)

Trivial merge