From: Keith Packard <keithp@keithp.com>
Date: Sat, 31 Aug 2013 13:22:09 +0000 (-0500)
Subject: Merge branch 'master' into new-state
X-Git-Tag: 1.2.9.4~112
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7ec1b97d278c7aec3199fb7270f0dcf9484c879f

Merge branch 'master' into new-state
---

7ec1b97d278c7aec3199fb7270f0dcf9484c879f