Chinese liquor makers settle trademark feud; court revokes controversial judgment  MLex