Merge branch 'master' into droid-gps
[fw/altos] / altosdroid / default.properties
2012-06-03 Keith Packardaltosdroid: import code from mjb