Merge remote branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sun, 27 Jun 2010 06:45:02 +0000 (23:45 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 27 Jun 2010 06:45:02 +0000 (23:45 -0700)

Trivial merge