A combined analysis of the hadronic and leptonic decays of the Z0