Merge from rta-rpm.
Hmm. Forgot to merge the Changelog too.