e74c5ad Merge branch 'master' into el6

Merged and Committed by agoode 13 years ago
    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    
        
file modified
+1 -1
lwp-2.6-no-longjmp_chk.patch lwp-2.5-no-longjmp_chk.patch
file renamed
+16 -3
file modified
+11 -7
file modified
+1 -1