Merge branch 'media-verif'
authorDuncan Mac-Vicar P <dmacvicar@suse.de>
Tue, 24 Jul 2007 12:44:08 +0000 (12:44 +0000)
committerDuncan Mac-Vicar P <dmacvicar@suse.de>
Tue, 24 Jul 2007 12:44:08 +0000 (12:44 +0000)
commit69532a125d40f462790e9823a6a023111144d781
treeb6819b0c59e073f3fd39728a6d2f192c5361eb4d
parentf64ca6ad1c1e332c7e238f57d8982de8e77599f8
Merge branch 'media-verif'

Conflicts:

zypp/repo/RepoProvideFile.cc
zypp/RepoInfo.cc
zypp/RepoInfo.h
zypp/RepoManager.cc
zypp/repo/PackageProvider.cc
zypp/repo/PackageProvider.h
zypp/repo/RepoProvideFile.cc
zypp/repo/RepoProvideFile.h
zypp/repo/SUSEMediaVerifier.cc
zypp/repo/SUSEMediaVerifier.h
zypp/target/TargetImpl.cc