Re-based on tree submitted to RMK, so there where some fixups that had to be done. This has only been compile test and thus needs testing. If someone else can test and send me a tested-by: line for any of the patches in this series then please let me know.