[make/f14/master: 2/2] Merge remote branch 'origin/f14/master' into f14/master

[Petr Machata]

commit 49cf6ef2f16d29d3c3592de1c2dcff16f2eb69a8
Merge: 4527792 f03de16
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Oct 27 02:45:42 2010 +0200

    Merge remote branch 'origin/f14/master' into f14/master
    
    Conflicts:
    	make.spec

 make.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc make.spec
index f5c3dcf,ce5bb3b..13b12ff
--- a/make.spec
+++ b/make.spec
@@@ -85,11 -83,9 +85,14 @@@ f
  %{_infodir}/*.info*
  
  %changelog
 +* Wed Oct 27 2010 Petr Machata <pmachata at redhat.com> - 1:3.82-3
 +- Fix a discrepancy between behavior of find_next_token and
 +  pre-allocation of token memory in func_sort.
 +- Resolves: #643359
 +
+ * Wed Sep 29 2010 jkeating - 1:3.82-2.1
+ - Rebuilt for gcc bug 634757
+ 
  * Mon Sep 13 2010 Petr Machata <pmachata at redhat.com> - 1:3.82-2
  - Add upstream fixes for upstream bugs 30612 and 30723
  - Resolves: #631552