I think it does have to be that one specific bottle of water from the kitchen, alas. I had also drunk that water when I got to the prisoner, and when I found that he refused all the nice mugs of water I had, I reloaded an earlier save (thanks Larian for the 5 quick save slots! Way to go! <img src="/ubbthreads/images/graemlins/up.gif" alt="" /> ) and went back and got that specific bottle. That worked.
Yeah, quests shouldn't be designed that way; if you need one particular thing, it should have a special name ("Extra Wet Water" or whatever). Better, it should accept any water. So I guess this is a <img src="/ubbthreads/images/graemlins/down.gif" alt="" /> to balance that <img src="/ubbthreads/images/graemlins/up.gif" alt="" /> . <img src="/ubbthreads/images/graemlins/winkwink.gif" alt="" />