Merge branch 'cookie_daemon' into experimental

diff --cc examples/data/uzbl/scripts/cookie_daemon.py
index 8a2e154,3451727..5501251
--- 1/examples/data/uzbl/scripts/cookie_daemon.py
--- 2/examples/data/uzbl/scripts/cookie_daemon.py
+++ b/examples/data/uzbl/scripts/cookie_daemon.py
@@@ -440,7 -448,9 +448,9 @@@ if __name__ == "__main__"
              echo("fatal error: expected int argument for --daemon-timeout")
              sys.exit(1)
  
+     # Expand $VAR's in config keys that relate to paths.
      for key in ['cookie_socket', 'cookie_jar']:
-         config[key] = os.path.expandvars(config[key])
+         if config[key]:
+             config[key] = os.path.expandvars(config[key])
  
 -    CookieMonster().run()
 +    CookieMonster().run()