Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Tue, 28 Jan 2014 03:02:15 +0000 (19:02 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 28 Jan 2014 03:02:15 +0000 (19:02 -0800)

Trivial merge