Signed-off-by: Robert Fairley rfairley@redhat.com
rebased onto 5b9d197bc241f69d46009f38b26e380d7ff3c242
Pull-Request has been merged by sgallagh
Signed-off-by: Robert Fairley rfairley@redhat.com