Merge branch 'upstream' into dfsg-orig
authorBdale Garbee <bdale@gag.com>
Wed, 10 Nov 2010 22:41:01 +0000 (15:41 -0700)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Nov 2010 22:41:01 +0000 (15:41 -0700)
commit84dd32d487759d017e068786160b5d1a0f1682e5
tree53306c988b0e94e16763320cadb021606aae4b40
parentb414e25de8ca49d7567a92c203d431383ec57c83
parentdda6367c9eac71da8f2ab1c60b3df60f19ce4755
Merge branch 'upstream' into dfsg-orig

Conflicts:
doc/stamp-vti
doc/tar.info
doc/tar.info-1
doc/tar.info-2
doc/tar.texi
doc/version.texi