f324326 - Merge with upstream and more rpmlint cleanup.

Authored and Committed by Permaine Cheung 17 years ago
    - Merge with upstream and more rpmlint cleanup.