Merge branch 'master' into branch-1.8
[fw/altos] / src / telelco-v0.1 / .gitignore
2012-08-30 Keith Packardaltos: another .gitignore file