24a97a22d2
Merged changes from Debian and RHEL. Some minor fixes added. Authors: Craig Small <csmall@debian.org>, Jari Aalto <jari.aalto@cante.net>, David Prévot <david@tilapin.org>, Daniel Novotny