From: Keith Packard <keithp@keithp.com>
Date: Mon, 20 May 2013 03:40:42 +0000 (-0700)
Subject: Merge branch 'master' into lpc
X-Git-Tag: 1.2.9.4~189^2~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=27e9b93f3d35890a49575b2ead1983ce3c2fc213;hp=-c

Merge branch 'master' into lpc
---

27e9b93f3d35890a49575b2ead1983ce3c2fc213