Merge branch 'disintegrate-frv' into disintegrate-misc-arches
authorDavid Howells <dhowells@redhat.com>
Wed, 10 Oct 2012 11:34:29 +0000 (12:34 +0100)
committerDavid Howells <dhowells@redhat.com>
Wed, 10 Oct 2012 11:34:29 +0000 (12:34 +0100)
Signed-off-by: David Howells <dhowells@redhat.com>

Trivial merge