Merge branch 'disintegrate-frv' into disintegrate-misc-arches

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