Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 20:54:55 +0000 (13:54 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 4 Oct 2013 20:54:55 +0000 (13:54 -0700)

Trivial merge