Merge remote-tracking branch 'jwrdecoede/for-keith'
authorKeith Packard <keithp@keithp.com>
Sat, 22 Mar 2014 20:46:15 +0000 (13:46 -0700)
committerKeith Packard <keithp@keithp.com>
Sat, 22 Mar 2014 20:46:15 +0000 (13:46 -0700)

Trivial merge