Merge branch 'keys-misc' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 12 Apr 2016 19:09:34 +0000 (20:09 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 12 Apr 2016 19:09:34 +0000 (20:09 +0100)
Miscellaneous keyrings changes.

Signed-off-by: David Howells <dhowells@redhat.com>

Trivial merge