Edible oil or fat compositions containing an aqueous phase, e.g. margarines characterised by ingredients other than fatty acid triglycerides