From: Keith Packard <keithp@keithp.com>
Date: Thu, 20 Sep 2012 09:30:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'mjb/prefs_interface'
X-Git-Tag: 1.1.9.1~54
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=e69a433fd93b9f6bd2297d8045eb075fee29e73b;hp=-c

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

e69a433fd93b9f6bd2297d8045eb075fee29e73b