I'm going to putback the merge with onnv_88, together with a bunch of this mornings bustage fixes (in a separate merge, or a set of transplanted changes).
allegedly there's at least 2 more build-related fixes to come, so the merge will follow them, eventually. It'd be great if you'd refrain from putting back to onnv-scm until that's done (since I have the first part of the merge done, and would rather not re-do it). -- Rich
