Merge branch 'for-panu'

* for-panu:
  multiple vendor fingerprints, based on apt-0.5.15cnc6-alt-vendor.patch
  apt-0.5.15cnc6-alt-pkgcachegen.patch
  rpmpm.cc (pkgRPMLibPM::Process): commented out unused code which breaks gcc-4.1
  rpmhandler.cc (RPMHdrHandler::PRCO): fix for rpm-4.0
  aptcallback.cc: RPMCALLBACK_REPACKAGE* available only in rpm >= 4.1

diff --cc apt-pkg/acquire-item.cc
Simple merge

diff --cc apt-pkg/pkgcachegen.cc
Simple merge

diff --cc apt-pkg/repository.h
Simple merge

diff --cc apt-pkg/rpm/aptcallback.cc
Simple merge

diff --cc apt-pkg/rpm/rpmhandler.cc
Simple merge

diff --cc apt-pkg/rpm/rpmindexfile.cc
Simple merge

diff --cc apt-pkg/rpm/rpmpm.cc
Simple merge

diff --cc apt-pkg/sourcelist.cc
Simple merge

diff --cc apt-pkg/sourcelist.h
Simple merge