[make: 4/4] Merge branch 'f14/master'

[Petr Machata]

commit ccbdcb62ff33f4456e0d42002e18b160a0d37634
Merge: 9f8da0d 49cf6ef
Author: Petr Machata <pmachata at redhat.com>
Date:   Wed Oct 27 02:48:02 2010 +0200

    Merge branch 'f14/master'
    
    Conflicts:
    	make.spec

 make-3.82-sort-blank.patch |   22 ++++++++++++++++++++++
 make.spec                  |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --cc make.spec
index eb27f43,13b12ff..d747f22
--- a/make.spec
+++ b/make.spec
@@@ -3,7 -3,7 +3,7 @@@ Summary: A GNU tool which simplifies th
  Name: make
  Epoch: 1
  Version: 3.82
--Release: 3%{?dist}
++Release: 4%{?dist}
  License: GPLv2+
  Group: Development/Tools
  URL: http://www.gnu.org/software/make/
@@@ -83,7 -85,12 +85,12 @@@ f
  %{_infodir}/*.info*
  
  %changelog
 -* Wed Oct 27 2010 Petr Machata <pmachata at redhat.com> - 1:3.82-3
++* Wed Oct 27 2010 Petr Machata <pmachata at redhat.com> - 1:3.82-4
+ - 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
 +* Wed Sep 29 2010 jkeating - 1:3.82-3
  - Rebuilt for gcc bug 634757
  
  * Mon Sep 13 2010 Petr Machata <pmachata at redhat.com> - 1:3.82-2