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
I18N work: using I18N admin UI to walk through adp:s in file-storage and found a couple of texts that I turned into message lookups. About 20 new keys added