P.S. I've now reworded the description in the file a bit to make the intent clearer. I'm attaching the diff and the files here to make sure they stay available in the archive and since the diff would only be seen when actually using the Git checkout.
Maybe Mikael could confirm some time whether this solution was what he needed and whether it worked.
Christian.