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