Merge 'fix-update-and-delete-as_query' into 'trunk'
Peter Rabbitson [Thu, 7 May 2009 17:09:01 +0000 (17:09 +0000)]

Trivial merge