Merge /home/luca/pymin

Conflicts:

	config.py
	services/__init__.py

diff --cc config.py
index 1ae766d6364568d40b888d904c79ee43c4d80c28,9b0932da5db699fd8e60418196bb176231c690b8..f135b23e20371cab8cc672d30c01ab16c4d1516b
--- 1/config.py
--- 2/config.py
+++ b/config.py
@@@ -10,15 -10,15 +10,18 @@@ def test_func(*args)
  
  routes = dict \
  (
--    test = test_func,
      dhcp = DhcpHandler(
          pickle_dir = 'var/lib/pymin/pickle/dhcp',
          config_dir = 'var/lib/pymin/config/dhcp',
      ),
-     )
 +    dns = DnsHandler(
 +        pickle_dir = 'var/lib/pymin/pickle/dns',
 +        config_dir = 'var/lib/pymin/config/dns',
++    ),
+     firewall = FirewallHandler(
+         pickle_dir = 'var/lib/pymin/pickle/firewall',
+         config_dir = 'var/lib/pymin/config/firewall',
+     ),
  )
  
  bind_addr = \

diff --cc pymindaemon.py
Simple merge

diff --cc services/__init__.py
index 0572631633e5e8cd3dc14312bf818a59bc8020e4,c9ec9b35df321e518cc4056abc2546a096273c23..e1a505d731ee970b9e69736c45e1473fcfb72445
--- 1/services/__init__.py
--- 2/services/__init__.py
+++ b/services/__init__.py
@@@ -1,5 -1,5 +1,6 @@@
  # vim: set encoding=utf-8 et sw=4 sts=4 :
  
  from services.dhcp import DhcpHandler
 +from services.dns import DnsHandler
+ from services.firewall import FirewallHandler