Merge remote-tracking branch 'whot/for-keith'
authorKeith Packard <keithp@keithp.com>
Wed, 19 Mar 2014 13:43:14 +0000 (06:43 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 19 Mar 2014 13:43:14 +0000 (06:43 -0700)

Trivial merge