Merge remote-tracking branch 'origin/master' into new-stuff
authorKeith Packard <keithp@keithp.com>
Tue, 11 Nov 2014 23:10:28 +0000 (15:10 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 11 Nov 2014 23:10:28 +0000 (15:10 -0800)

Trivial merge