Merge branch 'master' into keith-bits
authorKeith Packard <keithp@keithp.com>
Wed, 9 Apr 2014 04:11:46 +0000 (21:11 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 9 Apr 2014 04:11:46 +0000 (21:11 -0700)
Replaces bdale's changes with mine


Trivial merge