Merge branch 'master' of baryon.com.ar:/home/luca/pymin

Conflicts:

	config.py

diff --cc config.py
index 91d8e2eb8d2c2ed72cccce32807c303098c25ff5,3ff98c687a8c2a99eb8e16cf7508beb49b698e84..a0b5498cc228f50a57a330ef3319c239a5c21b47
--- 1/config.py
--- 2/config.py
+++ b/config.py
@@@ -11,15 -11,9 +11,15 @@@ config_path = join(base_path, 'config'
  
  class Root(Handler):
  
 +    def __init__(self):
 +        f = file("/proc/sys/net/ipv4/ip_forward","w")
 +        f.write("1")
 +        f.close()
 +        #self.ip.device_up_hook(self.dns)
 +
      firewall = FirewallHandler(
          pickle_dir = join(pickle_path, 'firewall'),
-         config_dir = '/tmp')
+         config_dir = join(config_path, 'firewall'))
  
      nat = NatHandler(pickle_dir = join(pickle_path, 'nat'))
  

diff --cc pymin/services/util.py
Simple merge