From: Bdale Garbee <bdale@gag.com>
Date: Mon, 1 Nov 2010 23:29:19 +0000 (-0600)
Subject: Merge branch 'dfsg-orig' into dfsg-debian
X-Git-Url: https://git.cworth.org/git?a=commitdiff_plain;h=de7372b23c3da92fbfaea2d1ac592f0b2ba87914;hp=de7372b23c3da92fbfaea2d1ac592f0b2ba87914;p=tar

Merge branch 'dfsg-orig' into dfsg-debian

Conflicts:
	build-aux/config.guess
	build-aux/config.sub
	rmt/rmt.c
	src/extract.c
	tests/testsuite
---