With all of the work going on lately in both trees, I figured I should do a merge before things get to far askew. Most of the conflicts were in the displist/subsurf code. I don't know a lot about what is going on there, so somebody should check it out. Chris