[yum: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/yum

[James Antill]

commit 0697c15f027fcb5060f55613b4d1cfe18921c429
Merge: bb24d5a e3b4642
Author: James Antill <james at and.org>
Date:   Thu Jun 30 13:07:08 2011 -0400

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/yum
    
    * 'master' of ssh://pkgs.fedoraproject.org/yum:
      Add ppc64 arch. change for BZ 713791.
    
    Conflicts:
    	yum.spec

---