From: Keith Packard <keithp@keithp.com>
Date: Thu, 29 Jul 2010 19:07:49 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: debian/0.6+290+g7877496~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7877496d47ce6d25210c0e1c6500666dbfc0876c

Merge remote branch 'origin/master'
---

7877496d47ce6d25210c0e1c6500666dbfc0876c