commit to OACS-5-2 merge of changes on OACS-5-1
(using tag vg-merge-dotlrn-2-1-20050922) for packages under dotlrn-all
(using tag vg-merge-dotlrn-2-1-20050922) for packages under dotlrn-all