jader
committed
on 20 May 04
Resolves conflicts, merging from HEAD to oacs-5-1