From: Bdale Garbee <bdale@gag.com>
Date: Tue, 18 Aug 2009 20:40:54 +0000 (-0600)
Subject: Merge branch 'master' into debian
X-Git-Tag: debian/1.1-1~25
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=7aa251970cbbb6b9d9678ed0721e28da3df9036b;p=fw%2Faltos

Merge branch 'master' into debian
---

7aa251970cbbb6b9d9678ed0721e28da3df9036b