Merge commit 'upstream/2.10'
authorBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 18:32:59 +0000 (12:32 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 8 Sep 2009 18:32:59 +0000 (12:32 -0600)
commitd54e661a771b394610329fb0cd5e7b5002ae1708
tree1acb577260610ab88bb99cad8e5b597cdd9ef81e
parentd5eb355982e56d71ece1e5e37a495475d3fb64ab
parentda79766c5b4c4bae50ddc7bd81b610d3a45c5899
Merge commit 'upstream/2.10'

Conflicts:
Makefile.in
config.guess
config.sub
fsck.cpm.1.in
fsed.cpm.1.in