sync with upstream
sync with upstream
sync with upstream.
cleanup and fix /usr/libexec/hald-generate-fdi-cache 1st run on new setups.
sync with upstream.