Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

Conflicts:
	ao-bringup/turnon_telemega

diff --cc ao-bringup/turnon_telemega
index 46c254b6477bf48c2d50004237ac2b2853756875,9705798a09c8bd25056674cbe93e57009da13c82..7745a8e560abcddf71bddf50fc8281c0db75965d
--- 1/ao-bringup/turnon_telemega
--- 2/ao-bringup/turnon_telemega
+++ b/ao-bringup/turnon_telemega
@@@ -54,6 -54,4 +54,6 @@@ echo 'E 0' > $de
  
  SERIAL=$SERIAL ./cal-freq $dev
  
- ./cal-accel $dev
+ ../ao-tools/ao-cal-accel/ao-cal-accel $dev
 +
 +echo 'E 1' > $dev