Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos] / altosdroid / .settings /
2012-06-03 Keith Packardaltosdroid: import code from mjb