Merge remote-tracking branch 'origin/master'
[fw/altos] / altosdroid / .settings / org.eclipse.jdt.core.prefs
2012-06-03 Keith Packardaltosdroid: import code from mjb