Canon Resolves Patent Dispute with Katun, General Plastic