OK, I put this in 2.6.18 since I had a few other fixes that I thought should go into 2.6.18 too. It was a close call between merging this now or putting it into 2.6.19 and waiting for 2.6.18.1, but I don't think it matters much either way. - R.