From: Keith Packard <keithp@keithp.com>
Date: Tue, 16 Apr 2013 06:26:33 +0000 (-0700)
Subject: Merge branch 'master' into droid-gps
X-Git-Tag: altosdroid_v1.2-1~9^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=d5a557004c00d1ae25da04dc63c78b816562a236

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

d5a557004c00d1ae25da04dc63c78b816562a236