Merge commit 'upstream/0.4b42'
authorBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 15:38:50 +0000 (09:38 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 18 Jun 2009 15:38:50 +0000 (09:38 -0600)
commita864f08d55aeb4954e3e63307a176ba97dc8ca2c
treee5a75a01cf366f3383f7c8ecddd97f4aa2e4d012
parent6481a93d665c0bedf3a5d636c6d842107309c1de
parent3c2c604b3b2a51fa1717a2212b5fed9145b51cd1
Merge commit 'upstream/0.4b42'

Conflicts:
CHANGES
MCONFIG.in
configure
configure.in
dump.lsm
dump.spec
dump/dump.8.in
dump/tape.c
dump/traverse.c
examples/dump_on_cd_3/dump_disk
restore/Makefile.in
restore/dirs.c
restore/main.c
restore/restore.8.in
restore/restore.c
restore/restore.h
restore/tape.c
restore/xattr.c
debian/changelog
restore/restore.h