Merge commit 'upstream/2.10'

Conflicts:
	Makefile.in
	config.guess
	config.sub

diff --combined fsck.cpm.1.in
index f0c7ddf041ec7d5ce2e86c2d89e6e0500770eb95,bbef1304e8d03f63d4498c2a07b67282895bd5fc..1338560cedeff5cca3d55661e00acac709f0933b
--- 1/fsck.cpm.1.in
--- 2/fsck.cpm.1.in
+++ b/fsck.cpm.1.in
@@@ -1,5 -1,5 +1,5 @@@
  .TH FSCK.CPM 1 "@UPDATED@" "CP/M tools" "User commands"
 -.SH NAME ..\"{{{roff}}}\"{{{
 +.SH NAME \"{{{roff}}}\"{{{
  fsck.cpm \- check a CP/M file system
  .\"}}}
  .SH SYNOPSIS .\"{{{
@@@ -38,11 -38,10 +38,11 @@@ Any errors are indicated by exit code 1
  @DATADIR@/diskdefs    CP/M disk format definitions
  .\"}}}
  .SH DIAGNOSTICS .\"{{{
 -.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% non-contiguos), \fIused\fP/\fItotal\fP blocks"
 +.IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% 
 +non-contiguous), \fIused\fP/\fItotal\fP blocks"
  No inconsistencies could be found.  The number of used files actually
  is the number of used extents.  Since a file may use more than
 -one extent, this may be greather than the actual number of files, but a
 +one extent, this may be greater than the actual number of files, but a
  correct measure would not reflect how many files could still be created
  at most.  A file is considered fragmented, if sequential data blocks
  pointed to by the same extent do not have sequential block numbers.
@@@ -50,7 -49,7 +50,7 @@@ The number of used blocks includes the 
  and the directory.
  .\"}}}
  .SH AUTHORS .\"{{{
- This program is copyright 1997\(en2007 Michael Haardt
+ This program is copyright 1997\(en2008 Michael Haardt
  <michael@moria.de>.  The Windows port is copyright 2000, 2001 John Elliott
  <jce@seasip.demon.co.uk>.
  .PP

diff --combined fsed.cpm.1.in
index d3af90960c5660780ffd3e39e3b32f6a438fe203,5f562fc9bc9b8bc4550a9010dea9b963fe762ca5..2b7f140a99c40694e60c40ed54af622bc4bda3ad
--- 1/fsed.cpm.1.in
--- 2/fsed.cpm.1.in
+++ b/fsed.cpm.1.in
@@@ -1,5 -1,5 +1,5 @@@
  .TH FSED.CPM 1 "@UPDATED@" "CP/M tools" "User commands"
 -.SH NAME ..\"{{{roff}}}\"{{{
 +.SH NAME \"{{{roff}}}\"{{{
  fsed.cpm \- edit a CP/M file system
  .\"}}}
  .SH SYNOPSIS .\"{{{
@@@ -30,7 -30,7 +30,7 @@@ Any errors are indicated by exit code 1
  @DATADIR@/diskdefs    CP/M disk format definitions
  .\"}}}
  .SH AUTHORS \"{{{
- This program is copyright 1997\(en2007 Michael Haardt
+ This program is copyright 1997\(en2008 Michael Haardt
  <michael@moria.de>.  The Windows port is copyright 2000, 2001 John Elliott
  <jce@seasip.demon.co.uk>.
  .PP