Merge remote-tracking branch 'integrity/next-with-keys' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:54:43 +0000 (21:54 +0100)
Signed-off-by: David Howells <dhowells@redhat.com>

Trivial merge