Merge branch 'master' into hacking-cc1120
[fw/altos] / altosdroid / .settings /
2012-06-03 Keith Packardaltosdroid: import code from mjb