Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Thu, 5 Jun 2008 17:47:52 +0000 (11:47 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 5 Jun 2008 17:47:52 +0000 (11:47 -0600)
commit975c05c916276c70d34b5aa14e5f0faca1ae013d
tree84e11e6bba0786406d613babe6ce7e262a881bbc
parentc4ba8df750462c815e87975d03c0bdb6c52e4822
parent224b4e6d27a3af235500d9d8028ddbd3a60af7ed
Merge branch 'upstream'

Conflicts:

Makefile.in
NEWS
config.guess
config.sub
configure
configure.in
diskdefs
config.guess
config.sub
cpmrm.1.in
debian/copyright
diskdefs
fsck.cpm.1.in