Merge branch 'master' into branch-1.6
[fw/altos] / altosdroid / keystore
2012-06-03 Keith Packardaltosdroid: import code from mjb