From: Keith Packard <keithp@keithp.com>
Date: Fri, 26 Apr 2013 05:22:50 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.1~98
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=cef4e3ee95037050ae859fb2fdc0a57373764bd8

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

cef4e3ee95037050ae859fb2fdc0a57373764bd8