Whoops, I lost a hunk of the last patch somehow.
Signed-off-by: NDave Jones <davej@redhat.com>