Merge remote branch 'remotes/origin/fix-reset'
[fw/altos] / src / test / .gitignore
2010-02-21 Keith PackardUpdate .gitignore files