CLR
You might also try a product called CLR (Calcium, Lime & Rust) Remover. I have used this on windows and glass for hard water deposits, as well as on porcelain sinks and bathtubs for rust stains, and have had good results.
The description on the product web site lists a use for this in...