[mingw32-nsis/el5/master: 20/20] Merge branch 'master' into el5/master

[Paolo Bonzini]

commit 02afb7ff6ca84432ede419bb846b5952561ffb21
Merge: 4fcb9b5 1823302
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Fri Dec 17 09:57:04 2010 +0100

    Merge branch 'master' into el5/master
    
    - Update to 2.46 (#544675)
    - Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)
    - Re-enable System.dll plugin, inline Microsoft assembler code was
      replaced in 2.42 (#509234)
    
    Conflicts:
    	.gitignore

 .gitignore                    |    3 ++-
 import.log                    |    1 -
 mingw32-nsis.spec             |   17 ++++++++++++-----
 nsis-2.45-static-libgcc.patch |   12 ++++++++++++
 sources                       |    2 +-
 5 files changed, 27 insertions(+), 8 deletions(-)
---
diff --cc mingw32-nsis.spec
index 9a2a68e,795b96f..df00878
--- a/mingw32-nsis.spec
+++ b/mingw32-nsis.spec
@@@ -89,6 -90,22 +90,12 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
 -* Wed Aug 11 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.46-1
++* Fri Dec 17 2010 Paolo Bonzini <pbonzini at redhat.com> - 2.46-1
+ - Update to 2.46 (#544675)
 -
 -* Mon Jan 11 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.45-3
+ - Make plugins not depend on libgcc_s_sjlj-1.dll (#553971)
 -
 -* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.45-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Tue Jul 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.45-1
 -- Update to 2.45 (#512429)
 -
 -* Tue Jun 30 2009 Stu Tomlinson <stu at nosnilmot.com> - 2.44-2
+ - Re-enable System.dll plugin, inline Microsoft assembler code was
+   replaced in 2.42 (#509234)
+ 
  * Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.44-1
  - Update to 2.44 (#488522)