From: Bdale Garbee <bdale@gag.com>
Date: Thu, 3 Sep 2009 05:17:37 +0000 (-0600)
Subject: Merge commit 'origin/master'
X-Git-Tag: debian/0.5+77+gc57bd7f~34
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=cb4a73f3b65ba72f645fd37ab8712829c9537bf8

Merge commit 'origin/master'
---

cb4a73f3b65ba72f645fd37ab8712829c9537bf8