[yum/f18: 2/2] Merge branch 'master' into f18

[James Antill]

commit 91f6da803fc50e72cb580210983bebeaee25d5c5
Merge: 3624839 db2d6df
Author: James Antill <james at and.org>
Date:   Tue Aug 28 16:19:39 2012 -0400

    Merge branch 'master' into f18
    
    * master:
      update to latest HEAD.

 yum-HEAD.patch |  381 +++++++++++++++++++++++++++++++-------------------------
 yum.spec       |    5 +-
 2 files changed, 214 insertions(+), 172 deletions(-)
---
diff --cc yum.spec
index 9ec3f6f,2b7c55b..7badf5c
--- a/yum.spec
+++ b/yum.spec
@@@ -320,14 -320,15 +320,15 @@@ exit 
  - Fix environment groups write.
  - Allow merging of updateinfo.
  - Add releasever/arch to repoids on output, if used in urls.
+ - Merge mirror errors fix.
  
 -* Thu Aug 23 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-34
 -- Some users skip setupProgressCallbacks(). BZ 850913.
 +* Mon Aug 27 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-34
 +- update to latest HEAD.
 +- customized multi_progress_obj option
 +- improved reporting of mirror group failures
  
  * Wed Aug 22 2012 Zdenek Pavlas <zpavlas at redhat.com> - 3.4.3-33
 -- update to latest HEAD.
 -- Set multi_progress_obj option
 -- Show full URLs and mirror errors when _getFile() fails.
 +- Fix a typo in checkfunc. BZ 850550
  
  * Thu Aug 16 2012 James Antill <james at fedoraproject.org> - 3.4.3-32
  - update to latest HEAD.