Martin Josefsson wrote:

>On Sat, 2003-10-11 at 23:22, Henrik Nordstrom wrote:
>  
>
>>After a recent CVS update of my pom tree the pending patch set no longer 
>>applies to 2.4.22, failing in pending/69_amanda-helpers.patch
>>    
>>
>
>I havn't had time to do my usual checking to see if everything applies.
>I usually catch these things fairly quickly.
>
>After a very quick look, I'd say it looks like a conflict between
>61-remove-memsets.patch and 69_amanda-helpers.patch
>Both by Patrick.
>
>Patrick, do you think you could fix it up?
>

This should do it.

Best regards,
Patrick