From: Bdale Garbee <bdale@gag.com>
Date: Thu, 6 May 2010 18:47:30 +0000 (-0600)
Subject: Merge remote branch 'remotes/origin/fix-reset'
X-Git-Tag: debian/0.6+193+g314d27a~1
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=314d27a73c903fef2968dabac3d5313573713460

Merge remote branch 'remotes/origin/fix-reset'
---

314d27a73c903fef2968dabac3d5313573713460