5.6: Do it

[Tony Balinski]

Quoting Scott Tringali <scott.tringali at totalviewtech.com>:

> No worries.  Broken as CVS is, I've been dealing with CVS every day for
> about 10 years now, the branch merge will be fine.  Just commit it in
> one place and I'll put it all together.
>
> It will be very short-lived anyway, and I wanted to see if anyone had
> any interest in committing larger changes to the mainline anyway.

Where do I start?!

:)

Tony