I think we should merge the x86-64 branch into the trunk. It works fine on almost all of our platforms, and we are just causing problems by having it as a separate branch, as well as extra work porting patches between branches. We're also missing out on getting some more testing from people who live in the trunk. Thoughts?