[Rpm-maint] [PATCH] Merge with build-id rework

[Florian Festi]

I just merged the Mark Wielaars' patches upstream. Even with this merge
patch things do not apply cleanly. Can you just rebase on top of master,
please?

Thanks!

	Florian

-- 

Red Hat GmbH, http://www.de.redhat.com/, Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Paul Argiry, Charles Cachera, Michael Cunningham,
Michael O'Neill