Here is an updated version of the previous patch to handle the various 
GUI merging tools.

Pierre