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

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

6592a5be127a9c95d3b2e7d5aa6ffba71c6748b9