Merge branch 'master' into branch-1.6
[fw/altos] / src / teleterra-v0.2 / .gitignore
2011-10-27 Keith Packardaltos: Bring up basic TeleTerra v0.2 UI multiarch