elf move merge botched

Wed Mar 28 08:52:00 GMT 2012

On 03/28/2012 10:47 AM, Andreas Schwab wrote:
> Andreas Jaeger<aj@suse.com>  writes:
>
>> Sorry for the screwup, seems the final git merge did not work out as
>> intented ;-(
>
> Looks like you merged the wrong branch (and you shouldn't have done the
> extra merge of master).

That's what indeed happened ;-( What a mess. Sorry.

I'll compare now the right branch with what I committed and cleanup any 
issues.

Andreas
-- 
  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
   SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 NÃ¼rnberg, Germany
    GF: Jeff Hawn,Jennifer Guild,Felix ImendÃ¶rffer,HRB16746 (AG NÃ¼rnberg)
     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126