On 23 September 2011 17:37, Jonathan Matthews <contact at jpluscplusm.com> wrote: > How can I both remote upstream's incorrect header, and also add the *remove*