[lwp/el6/master: 14/14] Merge branch 'master' into el6

[Adam Goode]

commit e74c5add8638330fa8d48b55a0f79b36554e8135
Merge: def113e cf10746
Author: Adam Goode <adam at spicenitz.org>
Date:   Fri Jul 30 11:29:23 2010 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                   |    2 +-
 lwp-2.5-no-longjmp_chk.patch |   21 ---------------------
 lwp-2.6-no-longjmp_chk.patch |   34 ++++++++++++++++++++++++++++++++++
 lwp.spec                     |   18 +++++++++++-------
 sources                      |    2 +-
 5 files changed, 47 insertions(+), 30 deletions(-)
---