Merge branch 'master' into suse

diff --combined config.py
index 8cc2dcf8f37b77494f27c1c38131a4d83d5e0198,ff7585623cf37c2164c67f94d457df589d8d9b59..5854e3497073ce11b418592c2e7b7afd8884a571
--- 1/config.py
--- 2/config.py
+++ b/config.py
@@@ -26,6 -26,10 +26,10 @@@ class Root(Handler)
              'nameX':        '/etc/ppp/peers',
          })
  
+     vpn = VpnHandler(
+          pickle_dir = join(pickle_path, 'vpn'),
+          config_dir = join(config_path, 'vpn'))
+ 
      ip = IpHandler(
          pickle_dir = join(pickle_path, 'ip'),
          config_dir = join(config_path, 'ip'))
@@@ -43,19 -47,16 +47,19 @@@
  
      proxy = ProxyHandler(
          pickle_dir = join(pickle_path, 'proxy'),
 -        config_dir = join(config_path, 'proxy'))
 +        config_dir = '/etc/squid')
  
      vrrp = VrrpHandler(
          pickle_dir = join(pickle_path, 'vrrp'),
          config_dir = join(config_path, 'vrrp'),
          pid_dir    = '/var/run')
 -
 -    qos = QoSHandler(
 -      pickle_dir = join(pickle_path, 'qos'),
 -      config_dir = join(config_path, 'qos'))
 +    
 +    vpn = VpnHandler(
 +        pickle_dir = join(pickle_path, 'vpn'),
 +        config_dir = '/etc/tinc')
 +    #qos = QoSHandler(
 +    # pickle_dir = join(pickle_path, 'qos'),
 +    # config_dir = join(config_path, 'qos'))
  
  bind_addr = \
  (