Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Tue, 25 Mar 2014 23:06:03 +0000 (16:06 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 25 Mar 2014 23:06:03 +0000 (16:06 -0700)

Trivial merge