Merge branch 'upstream' into debian
authorKeith Packard <keithp@keithp.com>
Tue, 24 Nov 2015 05:09:58 +0000 (21:09 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 24 Nov 2015 05:09:58 +0000 (21:09 -0800)

Trivial merge