From: Keith Packard <keithp@keithp.com>
Date: Thu, 8 Apr 2010 20:31:23 +0000 (-0700)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: debian/0.6+163+g01e524f~3
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=baaaac499cfbc1286ae55374cfdc796d32983b92

Merge remote branch 'origin/master'
---

baaaac499cfbc1286ae55374cfdc796d32983b92