From: Keith Packard <keithp@keithp.com>
Date: Thu, 30 Aug 2012 21:24:38 +0000 (-0500)
Subject: Merge remote-tracking branch 'mjb/master'
X-Git-Tag: 1.1~43
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b635cb26ba54c8f5c6a958e0ab0bc4d34d33b635;hp=--cc

Merge remote-tracking branch 'mjb/master'
---

b635cb26ba54c8f5c6a958e0ab0bc4d34d33b635