Merge branch 'master' into branch-1.6
[fw/altos] / debian / .gitignore
2010-02-21 Keith PackardUpdate .gitignore files