Merge branch 'master' into branch-1.8
[fw/altos] / src / telescience-v0.1 / .gitignore
2011-10-27 Keith Packardaltos: A bunch of missing .gitignore files (mostly)