Merge remote-tracking branch 'integrity/next-with-keys' into keys-next

author David Howells <dhowells@redhat.com>

Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)

committer David Howells <dhowells@redhat.com>

Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
author David Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
committer David Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
diff --cc crypto/asymmetric_keys/asymmetric_type.c
Simple merge
diff --cc crypto/asymmetric_keys/x509_public_key.c
Simple merge
author	David Howells <dhowells@redhat.com>
	Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
committer	David Howells <dhowells@redhat.com>
	Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
		1	2
crypto/asymmetric_keys/asymmetric_type.c	patch \|	diff1 \|	diff2 \|	blob \| history
crypto/asymmetric_keys/x509_public_key.c	patch \|	diff1 \|	diff2 \|	blob \| history