Merge branch 'svn-merger'

author David Sommerseth <davids@redhat.com>

Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)

committer David Sommerseth <davids@redhat.com>

Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)
author David Sommerseth <davids@redhat.com>
Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)
committer David Sommerseth <davids@redhat.com>
Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)
diff --cc ssl.c
Simple merge
diff --cc ssl.h
Simple merge
author	David Sommerseth <davids@redhat.com>
	Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)
committer	David Sommerseth <davids@redhat.com>
	Wed, 24 Aug 2011 11:06:39 +0000 (13:06 +0200)
		1	2
ssl.c	patch \|	diff1 \|	diff2 \|	blob \| history
ssl.h	patch \|	diff1 \|	diff2 \|	blob \| history