Merge branch 'master' of git://git.b9.com/clsql