- re-add changes from rpm-5_3 development.
- re-add changes from rpm-5_3 development.

devzero2000/RPM5,devzero2000/RPM5,devzero2000/RPM5,devzero2000/RPM5,devzero2000/RPM5,devzero2000/RPM5,devzero2000/RPM5