Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Thu, 8 Apr 2010 20:31:23 +0000 (13:31 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 8 Apr 2010 20:31:23 +0000 (13:31 -0700)

Trivial merge