merge upstream

author LaMont Jones <lamont@mmjgroup.com>

Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)

committer LaMont Jones <lamont@mmjgroup.com>

Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)
author LaMont Jones <lamont@mmjgroup.com>
Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)
committer LaMont Jones <lamont@mmjgroup.com>
Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)
diff --cc configure.ac
Simple merge
diff --cc getopt/getopt.1
Simple merge
diff --cc mount/mount.8
Simple merge
author	LaMont Jones <lamont@mmjgroup.com>
	Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)
committer	LaMont Jones <lamont@mmjgroup.com>
	Sun, 29 Jul 2007 04:33:29 +0000 (22:33 -0600)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
getopt/getopt.1	patch \|	diff1 \|	diff2 \|	blob \| history
mount/mount.8	patch \|	diff1 \|	diff2 \|	blob \| history