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
Show title on folder listing. If filename is different than title, show that as well. Show cr_mime_types.label mime type description instead of techincal mime type "code".