r9199: fold clsql-base and clsql-base-sys into clsql-base