Should food and beverage outlets charge for water?

Local celebrity Joanne Peh recently had an unpleasant experience at restaurant chain Nando's when she was asked to pay S$3.90 for a glass of warm water. Should customers be made to pay for water at restaurants, regardless of price?
Update: More details on Joanne Peh's experience:
445 answers 445