merge changes on oacs-5-1 branch to head, changes between jcd-merge-20040420 and jcd-merge-5-1-20040517 were merged, head pre changes is jcd-merge-pre-20040517 and post is jcd-merge-post-20040517
Fixed bug 1516 ... though there are other regexps that bear inspection, it's clear that some of them at least won't fail for legal Tcl source. So I just fixed this one regexp looking for spaces where spaces might not be in the source.