Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Tue, 13 May 2014 06:21:55 +0000 (23:21 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 13 May 2014 06:21:55 +0000 (23:21 -0700)

Trivial merge