From: Keith Packard <keithp@keithp.com>
Date: Fri, 12 Mar 2010 18:38:26 +0000 (-0800)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: debian/0.6+117+gb41e617~1^2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=df7bda1f32b0049c3878c325ea0b55999f3980e3

Merge remote branch 'origin/master'
---

df7bda1f32b0049c3878c325ea0b55999f3980e3