Merge remote-tracking branch 'origin/master'
[fw/altos] / altosdroid / .settings /
2012-06-03 Keith Packardaltosdroid: import code from mjb