Michael Wang's SQL fix from tashi-dev@i.a.o
Michael Wang's SQL fix from tashi-dev@i.a.o



git-svn-id: bf82309ee31681273af20a825c7064ea7c5af838@797241 13f79535-47bb-0310-9956-ffa450edef68

apache/tashi,apache/tashi,stroucki/tashi,apache/tashi,apache/tashi,stroucki/tashi,stroucki/tashi