tree fb178ff04e305853b36dcb2dda74d7ddece6c703
parent 3b2267e0c8898b8d2e8de024eaae570505456836
parent aa2c47e0a60470f20babaaa00ec94cf50c1feb6c
author David Howells <dhowells@redhat.com> 1349868869 +0100
committer David Howells <dhowells@redhat.com> 1349868869 +0100

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

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