Re: deliver binary conflict

[Arnt Gulbrandsen]

The conflict is in a sense appropriate. Our deliver does exactly the 
same thing as e.g. Cyrus, so you should have only one.

I suggest renaming it as aoxdeliver. Will do it upstream (I have a 
collection of patches to push, though, so you won't see it right away).

Arnt