From: Keith Packard <keithp@keithp.com>
Date: Sat, 17 Aug 2013 14:03:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.2.9.4~133^2~7
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4ff54bb96f6c00c0c2c7dd32f81403bac331621a

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

4ff54bb96f6c00c0c2c7dd32f81403bac331621a