Merge commit 'origin/master' into mdv-gpl3

Conflicts:
	bin/tools/convert.py

bzr revid: p_christ@hol.gr-20081025224421-g367ati5b2eeplw6
bzr revid: p_christ@hol.gr-20081104201238-oy0vgsunt2jxgu2p

diff --cc bin/addons/base/ir/ir.xml
Simple merge

diff --cc bin/addons/base/security/base_security.xml
Simple merge

diff --cc bin/netsvc.py
Simple merge

diff --cc bin/openerp-server.py
index f50aeef,49c60c8..49c60c8
mode 100755,100755..100644
--- 1/bin/openerp-server.py
--- 2/bin/openerp-server.py
+++ b/bin/openerp-server.py

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

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

diff --cc bin/ssl/SecureXMLRPCServer.py
Simple merge

diff --cc bin/tools/convert.py
index 910c408,06e4913..d3acc41
--- 1/bin/tools/convert.py
--- 2/bin/tools/convert.py
+++ b/bin/tools/convert.py
@@@ -105,13 -102,8 +102,13 @@@ def _eval_xml(self,node, pool, cr, uid
                      class pytzclass(object):
                          all_timezones=[]
                      pytz=pytzclass()
-                 idref['pytz'] = pytz
+                 idref2['pytz'] = pytz
 -                return eval(a_eval, idref2)
 +              try:
-                       return eval(a_eval, idref)
++                        return eval(a_eval, idref2)
 +              except:
 +                      logger = netsvc.Logger()
 +                      logger.notifyChannel("init", netsvc.LOG_WARNING, 'could eval(%s) for %s in %s, please get back and fix it!' % (a_eval,node.getAttribute('name'),context))
 +                      return ""
              if t == 'xml':
                  def _process(s, idref):
                      m = re.findall('[^%]%\((.*?)\)[ds]', s)

diff --cc bin/tools/translate.py
index 538f181,c5630d7..7e382ce
--- 1/bin/tools/translate.py
--- 2/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@@ -119,9 -108,10 +112,12 @@@ class TinyPoFile(object)
              while line.startswith('#'):
                  if line.startswith('#:'):
                      tmp_tnrs.append( line[2:].strip().split(':') )
 +              elif line.startswith('#,') and (line[2:].strip() == 'fuzzy'):
 +                      fuzzy = True
                  line = self.lines.pop(0).strip()
+             while not line:
+                 # allow empty lines between comments and msgid
+                 line = self.lines.pop(0).strip()
              if not line.startswith('msgid'):
                  raise Exception("malformed file: bad line: %s" % line)
              source = unquote(line[6:])