into siva.hindu.god:/home/tsmith/m/bk/maint/51 sql/log.cc: Manual merge
Attach a file by drag & drop or click to upload
