Merge commit 'upstream/2.12'

author Bdale Garbee <bdale@gag.com>

Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)

committer Bdale Garbee <bdale@gag.com>

Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)
author Bdale Garbee <bdale@gag.com>
Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)
committer Bdale Garbee <bdale@gag.com>
Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)
diff --cc fsck.cpm.1.in
Simple merge
diff --cc fsed.cpm.1.in
Simple merge
author	Bdale Garbee <bdale@gag.com>
	Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)
committer	Bdale Garbee <bdale@gag.com>
	Mon, 15 Mar 2010 22:07:54 +0000 (16:07 -0600)
		1	2
fsck.cpm.1.in	patch \|	diff1 \|	diff2 \|	blob \| history
fsed.cpm.1.in	patch \|	diff1 \|	diff2 \|	blob \| history