[ssldump/el6: 7/7] Merge remote branch 'origin/master' into el6

[Robert Scheck]

commit e696850e96b2ddff0f5b1f59859889df9afb1c6a
Merge: d466aeb e9646e8
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 24 22:46:24 2011 +0200

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	ssldump.spec

 ssldump-0.9-table-stops.patch |   54 +++++++++++++++++++++++++++++++++++++++++
 ssldump.spec                  |   10 +++++++-
 2 files changed, 63 insertions(+), 1 deletions(-)
---