Merge branch 'keys-fixes' into keys-next
authorDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:55:45 +0000 (21:55 +0100)
committerDavid Howells <dhowells@redhat.com>
Tue, 22 Jul 2014 20:55:45 +0000 (21:55 +0100)
Signed-off-by: David Howells <dhowells@redhat.com>

Trivial merge