[lwp/el5/master: 18/18] Merge branch 'el6' into el5

[Adam Goode]

commit 378f6aa495b954ad0acb7e36d2c1a639bfd836e2
Merge: b6e197d e74c5ad
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 11:41:05 2010 -0400

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	lwp.spec

 .gitignore |    2 +-
 lwp.spec   |    9 +++++++--
 sources    |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --cc lwp.spec
index cc0cd07,7d4697d..3631e02
--- a/lwp.spec
+++ b/lwp.spec
@@@ -65,8 -66,11 +65,13 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Thu Apr  1 2010 Adam Goode <adam at spicenitz.org> - 2.6-1
+ - New upstream release
+   + Fix fortify failure whenever a new thread is started (not really)
+   + ARM thumb2 assembly fix
 -- Update longjmp patch, upstream is not quite right yet
++
 +* Wed Sep  9 2009 Adam Goode <adam at spicenitz.org> - 2.5-4
 +- Remove F12 longjmp patch for EL-5
  
  * Thu Aug 20 2009 Adam Goode <adam at spicenitz.org> - 2.5-3
  - Add check to specfile