Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Fri, 12 Mar 2010 18:38:26 +0000 (10:38 -0800)
committerKeith Packard <keithp@keithp.com>
Fri, 12 Mar 2010 18:38:26 +0000 (10:38 -0800)

Trivial merge