[libsigsegv/el6: 9/9] Merge remote-tracking branch 'origin/master' into el6

[Rex Dieter]

commit 765365973b099c8f4d0d7b7de0a2d844347e65a3
Merge: 23b3d16 5c36e7f
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jun 20 11:59:54 2011 -0500

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                   |    3 +-
 libsigsegv-2.6-mystack.patch |  112 ------------------------------------------
 libsigsegv.spec              |   43 +++++++++-------
 sources                      |    2 +-
 4 files changed, 28 insertions(+), 132 deletions(-)
---