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)
Conflicts:
doc/stamp-vti
doc/tar.info
doc/tar.info-1
doc/tar.info-2
doc/tar.texi
doc/version.texi


Trivial merge