Since its under warranty, and, presumably out of spec, they should not charge you. It must be on your listing of equipment for CPS to qualify, so make sure its registered first.
You could send both the lens and the camera, if they tweak both to spec, then things should look pretty good.
Thanks again, that's a good point, "presumably" out of spec! With my Canon 400D and the 50mm 1.8 II I took razor-sharp photos, now with my 60D they are sharp but not as sharp as with my 400D. I wonder if it's only 'cause of the 10 to 18 Mpx upgrade, or both, that the 60D out of spec is not matching as good with the out of spec of the 50mm lens, not as good as with the 400D.
And yes, I'll register them on the CPS homepage, but unfortunately the 50mm 1.8 II does not qualify for CPS, and it got no more warranty, in contrary to the 15mm, which too got no more warranty, but it's a "CPS lens", I am already curious how much the calibration will cost..
Last but not least, how is this calibration done? How can they calibrate a lens? I am eager to know the technical facts behind it, maybe you know Mr. Mt. Spokane?