Merge branch 'micropeak-1.1'
[fw/altos] / altosdroid / .settings /
2012-06-03 Keith Packardaltosdroid: import code from mjb