Merged into trunk in r41508. A Smolder report of tests done just before the merge is viewable at http://smolder.plusthree.com/app/public_projects/report_details/3830. The coding standards test failures were addressed before the merge.
I'll allow a couple days for road testing, then resolve the ticket. Thank you very much. kid51
