From: Keith Packard <keithp@keithp.com>
Date: Thu, 17 Jun 2010 04:54:06 +0000 (-0700)
Subject: Merge remote branch 'mjb/master'
X-Git-Tag: debian/0.6+223+g5283451~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=11d155d558d0b121b66f089adee0a47d71f65a78

Merge remote branch 'mjb/master'
---

11d155d558d0b121b66f089adee0a47d71f65a78