Merge branch 'xrg' into optimize

Conflicts:
	bin/osv/orm.py

bzr revid: p_christ@hol.gr-20090828143403-c48ylvbkzgnimvhr

bin/sql_db.py

@@ -55,7 +55,7 @@ from mx import DateTime as mdt
 re_from = re.compile('.* from "?([a-zA-Z_0-9]+)"? .*$');
 re_into = re.compile('.* into "?([a-zA-Z_0-9]+)"? .*$');
 
-def log(msg, lvl=netsvc.LOG_DEBUG):
+def log(msg, lvl=netsvc.LOG_DEBUG2):
     logger = netsvc.Logger()
     logger.notifyChannel('sql', lvl, msg)