Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Thu, 17 Jun 2010 04:52:23 +0000 (21:52 -0700)
committerKeith Packard <keithp@keithp.com>
Thu, 17 Jun 2010 04:52:23 +0000 (21:52 -0700)

Trivial merge