[MERGE] Merged from the main trunk server branch.

bzr revid: ach@tinyerp.com-20100520050727-zdkp6mp65kmfm66o

diff --cc bin/addons/base/res/partner/partner_demo.xml
Simple merge

diff --cc bin/netsvc.py
Simple merge

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

diff --cc bin/tools/config.py
index f539b98,c18a742..a629e97
--- 1/bin/tools/config.py
--- 2/bin/tools/config.py
+++ b/bin/tools/config.py
@@@ -141,12 -141,10 +140,10 @@@ class configmanager(object)
          group = optparse.OptionGroup(parser, "Testing Configuration")
          group.add_option("--test-disable", action="store_true", dest="test_disable",
                           default=False, help="Disable loading test files.")
-         group.add_option("--test-no-rollback", action="store_false", dest="test_rollback",
-                          default=True, help="Don't rollback after running test.")
-         group.add_option("--test-continue", action="store_true", dest="test_continue",
-                          default=False, help="Display exception but then test should continue.")
+         group.add_option("--test-commit", action="store_true", dest="test_commit",
+                          default=False, help="Commit database changes performed by tests.")
          parser.add_option_group(group)
 -        
 +
          # Logging Group
          group = optparse.OptionGroup(parser, "Logging Configuration")
          group.add_option("--logfile", dest="logfile", help="file where the server log will be stored")

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

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

diff --cc setup.py
index 41f517f,38426f8..cb51961
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -176,14 -177,11 +177,14 @@@ options = 
          "compressed": 1,
          "optimize": 2,
          "dist_dir": 'dist',
 -        "packages": ["lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
 -                     "lxml.objectify", "decimal", "xml", "encodings",
 -                     "dateutil", "wizard", "pychart", "PIL", "pyparsing",
 -                     "pydot", "asyncore","asynchat", "reportlab", "vobject",
 -                     "HTMLParser", "select", "yaml", "pywebdav"],
 +        "packages": [
 +                 "lxml", "lxml.builder", "lxml._elementpath", "lxml.etree",
 +                 "lxml.objectify", "decimal", "xml", "xml", "xml.dom", "xml.xpath",
 +                 "encodings", "dateutil", "wizard", "pychart", "PIL", "pyparsing",
 +                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
 +                 "HTMLParser", "select", "mako", "poplib",
-                  "imaplib", "smtplib", "email", "yaml",
++                 "imaplib", "smtplib", "email", "yaml","pywebdav",
 +                 ],
          "excludes" : ["Tkconstants","Tkinter","tcl"],
      }
  }