Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale

Conflicts:
	config
	radicale/acl/authLdap.py
	radicale/config.py
	radicale/log.py

radicale/acl/authLdap.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import sys, ldap
+import sys, ldap, syslog
 
 from radicale import config, log
 

radicale/config.py

@@ -59,7 +59,15 @@ INITIAL_CONFIG = {
         "folder": os.path.expanduser("~/.config/radicale/calendars")},
     "logging": {
 		"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
-		"facility": 10}}
+		"facility": 10},
+	"authLdap": {
+		"LDAPServer": "127.0.0.1",
+		"LDAPPrepend": "uid=",
+		"LDAPAppend": "ou=users,dc=example,dc=com"},
+	"logging": {
+		"logfile": os.path.expanduser("~/.config/radicale/radicale.log"),
+		"facility": "error"}
+	}
 
 # Create a ConfigParser and configure it
 _CONFIG_PARSER = ConfigParser()

radicale/log.py

@@ -19,4 +19,5 @@ class log:
 
 _LOGGING = log()
 
-sys.modules[__name__] = _LOGGING
+sys.modules[__name__] = _LOGGING
+