[MERGE] Merged from the main trunk server branch.

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

1 files changed, 2 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 41f517f1689..cb51961ed3c 100755
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ required_modules = [
     ('pytz', 'Timezone handling library for Python'),
     ('reportlab', 'reportlab module'),
     ('yaml', 'YAML parser and emitter for Python'),
+    ('pywebdav', 'PyWebDAV is a standards compliant WebDAV server and library written in Python'),
 ]
 
 def check_modules():
@@ -182,7 +183,7 @@ options = {
                  "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"],
     }