Any suggestions about how to get stubborn water stains out of everyday glassware?

I feel a bit like a 50's housewife, but...I've already soaked in a white vinegar/water solution so any suggestions would be welcome. Thank you!