[MERGE] forward port of branch saas-3 up to revid 5116 [email protected]

bzr revid: [email protected]

Author: KangOl

setup.py

@@ -171,7 +171,7 @@ def py2exe_options():
           'python-openid',
           'pytz',
           'pyusb >= 1.0.0b1',
-          'pywebdav <= 0.9.4',
+          'pywebdav < 0.9.8',
           'pyyaml',
           'qrcode',
           'reportlab', # windows binary pypi.python.org/pypi/reportlab