Roland, Taken collectively, I don't see any major issues with these changes for 2.6.28. I hope to test these by the end of the week, but whenever you're happy with them, feel free to merge them. Sean