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

[Robert Scheck]

commit 5fc0943b4f8cfc4c8c79822caf1d2cd3796399c6
Merge: 0889708 e9646e8
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Mon Oct 24 22:47:02 2011 +0200

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

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