Merge commit 'origin/master' into mdv-gpl3-py26

Conflicts:
	bin/netsvc.py
	bin/sql_db.py
	bin/tools/translate.py

bzr revid: p_christ@hol.gr-20090208175840-xmy5c53ijl3rs1l5

diff --cc bin/addons/__init__.py
Simple merge

diff --cc bin/addons/base/ir/ir_cron.py
Simple merge

diff --cc bin/addons/base/rng/view.rng
Simple merge

diff --cc bin/netsvc.py
index b03dfad,75246e9..4056a10
--- 1/bin/netsvc.py
--- 2/bin/netsvc.py
+++ b/bin/netsvc.py
@@@ -92,8 -94,9 +94,8 @@@ def init_logger()
  
      logger = logging.getLogger()
      # create a format for log messages and dates
-     formatter = logging.Formatter('[%(asctime)s] %(levelname)s:%(name)s:%(message)s', '%Y-%m-%d %H:%M:%S')
+     formatter = logging.Formatter('[%(asctime)s] %(levelname)s:%(name)s:%(message)s')
 -    
 -    logging_to_stdout = False
 +
      if tools.config['syslog']:
          # SysLog Handler
          if os.name == 'nt':

diff --cc bin/osv/orm.py
Simple merge

diff --cc bin/report/printscreen/ps_list.py
Simple merge

diff --cc bin/sql_db.py
index 44ee286,1e88f1b..8fa364b
--- 1/bin/sql_db.py
--- 2/bin/sql_db.py
+++ b/bin/sql_db.py
@@@ -118,10 -116,10 +118,14 @@@ class Cursor(object)
          
          try:
              res = self._obj.execute(query, params)
 +      except psycopg2.ProgrammingError, pe:
 +          logger= netsvc.Logger()
 +          logger.notifyChannel('sql_db', netsvc.LOG_ERROR, "Programming error: %s, in query %s" % (pe, query))
 +          raise
+         except Exception, e:
+             log("bad query: %s" % self._obj.query)
+             log(e)
 -            raise
++          raise
  
          if self.sql_log:
              log("query: %s" % self._obj.query)

diff --cc bin/tools/config.py
Simple merge

diff --cc bin/tools/convert.py
Simple merge

diff --cc bin/tools/misc.py
Simple merge

diff --cc bin/tools/translate.py
Simple merge

diff --cc setup.py
Simple merge