From: Bdale Garbee <bdale@gag.com>
Date: Fri, 27 Aug 2010 18:38:25 +0000 (-0600)
Subject: Merge branch 'bdale'
X-Git-Tag: debian/0.6+373+gcf65c6b~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=cf65c6b8056c4af7c26b52ec6f9fbd3400cef638

Merge branch 'bdale'

Conflicts:
	debian/control
---

cf65c6b8056c4af7c26b52ec6f9fbd3400cef638