Merge commit 'upstream/2.13'

author Bdale Garbee <bdale@gag.com>

Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)

committer Bdale Garbee <bdale@gag.com>

Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)
author Bdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)
committer Bdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)
diff --cc fsck.cpm.1.in
Simple merge
diff --cc fsed.cpm.1.in
Simple merge
author	Bdale Garbee <bdale@gag.com>
	Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)
committer	Bdale Garbee <bdale@gag.com>
	Mon, 26 Dec 2011 08:02:16 +0000 (01:02 -0700)
		1	2
fsck.cpm.1.in	patch \|	diff1 \|	diff2 \|	blob \| history
fsed.cpm.1.in	patch \|	diff1 \|	diff2 \|	blob \| history