Merge branch 'telescience-v0.2'
[fw/altos] / altosdroid / keystore
2012-06-03 Keith Packardaltosdroid: import code from mjb