Later today I will post a list of files that will need to be manually merged or checked as part of the merge effort. We will need an "owner" for each of these files so that we can quickly resolve any problems. The last merge went smoothly (as smoothly as possible) due to everyone's cooperation. Hopefully this time we will spend even less time in merge hell :) - Mike.