Merge remote-tracking branch 'origin/master'
authorKeith Packard <keithp@keithp.com>
Sun, 15 Jun 2014 23:31:01 +0000 (16:31 -0700)
committerKeith Packard <keithp@keithp.com>
Sun, 15 Jun 2014 23:31:01 +0000 (16:31 -0700)

Trivial merge