Merge branch 'master' of /home/panos/tmp/tinyerp/openobject-server/ into mdv-gpl3

bzr revid: p_christ@hol.gr-20090106094017-i26aufnjth5am64m

1 files changed, 2 insertions, 2 deletions

diff --git a/setup.py b/setup.py
index 525a3b2b25a..73d37cdf43f 100755
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution	
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -140,7 +140,7 @@ options = {
                      "lxml.objectify", "decimal", "xml", "xml.dom", "xml.xpath", 
                      "encodings","mx.DateTime","wizard","pychart","PIL", "pyparsing", 
                      "pydot","asyncore","asynchat", "reportlab", "vobject",
-                     "HTMLParser", "OpenSSL", "select"],
+                     "HTMLParser", "select"],
         "excludes" : ["Tkconstants","Tkinter","tcl"],
     }
 }