From: Keith Packard <keithp@keithp.com>
Date: Mon, 15 Apr 2013 03:02:10 +0000 (-0700)
Subject: Merge branch 'master' into droid-gps
X-Git-Tag: altosdroid_v1.2-1~9^2~13
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c6f85cb149dff8732104521cb62b355e8a0d7148

Merge branch 'master' into droid-gps
---

c6f85cb149dff8732104521cb62b355e8a0d7148