How do you get hard water stains out of glass?

This can be caused by water with a lot of minerals in it.  CLR works great and if you add a little kosher salt (larger rocks) that also helps