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

Trivial merge