tree 5dad64c393d3b12276b35c5835c40c6d78f606a2
parent 64724cfc6eea920dbaada14f0fb978b1dd31192d
parent 0d1f64f60b4c50a8c604010ad3eef5cdfe9926bc
author David Howells <dhowells@redhat.com> 1406062545 +0100
committer David Howells <dhowells@redhat.com> 1406062545 +0100

Merge branch 'keys-fixes' into keys-next

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