Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 21:58:58 +0000 (14:58 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 29 Jul 2011 21:58:58 +0000 (14:58 -0700)

Trivial merge