elf move merge botched

[Andreas Jaeger]

On 03/28/2012 10:52 AM, Andreas Jaeger wrote:
> 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.

A git diff of the my branch against master shows no further differences, 
so I hope we can close for good.

Andreas - wearing a brown paper bag today ;-(
-- 
  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