Merge branch 'master' into telescience-v0.2
[fw/altos] / AUTHORS
1 Keith Packard   <keithp@keithp.com>
2 Bdale Garbee    <bdale@gag.com>