[binutils/f15: 2/2] Merge branch 'f15' of ssh://pkgs.fedoraproject.org/binutils into f15

[Nicholas Clifton]

commit 0ccb236294c87a3977cce580ea5fd7236fff6544
Merge: f466cc5 5704920
Author: Nick Clifton <nickc at redhat.com>
Date:   Tue Jul 12 15:51:21 2011 +0100

    Merge branch 'f15' of ssh://pkgs.fedoraproject.org/binutils into f15
    
    Conflicts:
    	binutils.spec
    
     Import patch for PR ld/12726.  (BZ 719733)

 binutils.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc binutils.spec
index faf5558,22b327c..9ade981
--- a/binutils.spec
+++ b/binutils.spec
@@@ -17,7 -17,7 +17,7 @@@
  Summary: A GNU collection of binary utilities
  Name: %{?cross}binutils%{?_with_debug:-debug}
  Version: 2.21.51.0.6
--Release: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv3+
  Group: Development/Tools
  URL: http://sources.redhat.com/binutils
@@@ -422,9 -421,9 +423,12 @@@ exit 
  %endif # %{isnative}
  
  %changelog
- * Tue Jul  12 2011 Nick Clifton <nickc at redhat.com> - 2.21.51.0.6-5
++* Tue Jul  12 2011 Nick Clifton <nickc at redhat.com> - 2.21.51.0.6-6
 +- import patch for PR ld/12726.  (BZ 719733)
 +
+ * Fri Jun  24 2011 Nick Clifton <nickc at redhat.com> - 2.21.51.0.6-5
+ - Run "alternatives --auto" to restore ld symbolic link if it was manually configured.  (BZ 661247)
+ 
  * Fri Jun  10 2011 Nick Clifton <nickc at redhat.com> - 2.21.51.0.6-4
  - Add check for dynamic sections misrepresented as notes.  (BZ 712166)