Merge ../pymin

diff --cc pymin/services/proxy/__init__.py
index 5e8460e21ac075fd5ae1f288cc16fd249fe44abd,399eba1bf341b5c9eb37bcad32d9738ff572dd48..2740cc8c8ab0f8d546cf6b8986d19bb37d825b17
--- 1/pymin/services/proxy/__init__.py
--- 2/pymin/services/proxy/__init__.py
+++ b/pymin/services/proxy/__init__.py
@@@ -116,9 -95,11 +112,11 @@@ class UserHandler(Handler)
  class ProxyHandler(Restorable, ConfigWriter, InitdHandler,
                     TransactionalHandler, ParametersHandler):
  
+     handler_help = u"Manage proxy service"
+ 
      _initd_name = 'squid'
  
 -    _persistent_attrs = ('params', 'hosts')
 +    _persistent_attrs = ('params', 'hosts', 'users')
  
      _restorable_defaults = dict(
              hosts = dict(),