Ok IGNORE this for now, it seems upstream has _just_ merged an alternative patch set for this very thing. If we pull anything it needs to be interface compatible with that. -apw