Done with sed, reverted the files that either had embedded patches or that may come from external sources (to keep maintenance burden down, by avoiding needless merge conflicts) Signed-off-by: Vincent Legoll <vincent.legoll@idgrilles.fr>