Deal Struck on Medicare Drugs