r9375: fix conflicted merge
r9375: fix conflicted merge

intronic/clsql,ryszard/clsql,intronic/clsql,sshirokov/CLSQL,intronic/clsql,ryszard/clsql,ryszard/clsql,intronic/clsql,sshirokov/CLSQL,sshirokov/CLSQL,sshirokov/CLSQL,ryszard/clsql