Water related conflicts: will they be more common in the future?

When water supplies come under stress through over use or rain shortages, conflict is often not far behind, as this example from Ethiopia shows:

http://news.bbc.co.uk/1/hi/world/africa/7929104.stm