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
Made the includable subsites template work (the link to register etc include the full subsite URL but the link to visit the subsite did not, which means it didn't work when included as a portlet.