Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sat, 27 Feb 2010 23:19:33 +0000 (15:19 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 27 Feb 2010 23:19:33 +0000 (15:19 -0800)

Trivial merge