User-Agent: Mozilla Thunderbird 1.0.8 (X11/20060502)
My personal preference is option B. (Just registering one
opinion; as an AD I'd be fine with other ways to merge the
documents too as long as the group agreed on one. Some
merging is indeed needed, however.)
--Jari