Mattia Rizzolo <mattia@debian.org> writes: > I'd just do a merge for this time, Yes, was thinking that after I sent the previous mail. I suspect I might get conflicts - especially as the changes appear to have been applied manually in both places, however I will deal with them :-) -- Brian May <bam@debian.org>