Merge branch 'upstream'
authorBdale Garbee <bdale@gag.com>
Mon, 11 Aug 2008 20:51:53 +0000 (17:51 -0300)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Aug 2008 20:51:53 +0000 (17:51 -0300)
commita547751988577b94d9cefd260173ec7e69b8669c
tree3023f6e3edfdd4c575bff206737e2609f7d13c27
parent13a3cb98a66bd66bb6627ccd5a5da35070c86f15
parent636335dbb356165e1d3e7cf91c416696d8b93910
Merge branch 'upstream'

Conflicts:

Makefile
ar_io.c
cpio.1
options.c
pat_rep.c
pax.1
pax.c
tar.1
tar.c
Makefile
ar_io.c
ar_subs.c
cache.c
cpio.c
gen_subs.c
options.c
sel_subs.c
tar.c