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)
commit92874d104eea09247e42195f290e901f892e5cd7
tree193f40aad34a69547be0e7af6cd3fa51f636b1bd
parent7ee7b0d533e544af3fd14188e61213e097abb1d8
parentde56e05d6d9b2434e1346dc4ec3939dc9752bedd
Merge branch 'master' into keith-bits

Replaces bdale's changes with mine