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

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

ff332e640b27c6be37dabef58ebac350ac2347b2