[yum/f18: 5/5] Merge in rawhide:

[James Antill]

commit 3624839cc2c9f3b6e0906da54ada3f13c3fbeba7
Merge: d98eeee eb06944
Author: James Antill <james at and.org>
Date:   Tue Aug 28 16:12:06 2012 -0400

     Merge in rawhide:
    
    update to latest HEAD.
    
    - Fix environment groups write.
    - Allow merging of updateinfo.
    - Add releasever/arch to repoids on output, if used in urls.

 yum-HEAD.patch |  615 ++++++++++++++++++++++++++++++++++----------------------
 yum.spec       |    8 +-
 2 files changed, 382 insertions(+), 241 deletions(-)
---
diff --cc yum.spec
index e1453c2,9697eb9..9ec3f6f
--- a/yum.spec
+++ b/yum.spec
@@@ -315,13 -315,19 +315,19 @@@ exit 
  %endif
  
  %changelog
+ * Tue Aug 28 2012 James Antill <james at fedoraproject.org> - 3.4.3-35
+ - update to latest HEAD.
+ - Fix environment groups write.
+ - Allow merging of updateinfo.
+ - Add releasever/arch to repoids on output, if used in urls.
+ 
 -* 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.