From: Keith Packard <keithp@keithp.com>
Date: Wed, 16 Jan 2013 18:40:28 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/telescience-v0.2' into telescience-v0.2
X-Git-Tag: altosdroid_v1.2-1~105^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=0c2fa9614ffe22901ba0fd089e1e02c362f9fbe0

Merge remote-tracking branch 'origin/telescience-v0.2' into telescience-v0.2
---

0c2fa9614ffe22901ba0fd089e1e02c362f9fbe0