> It looks good to me, but I have a question: is this against HEAD or > 2.95 branch? I thought all the x(m)? files were being killed off? Head. I hope the xm-* files aren't going completely away, there are a few leftover things they are still needed for (this being one of them).