[MERGE] trunk

bzr revid: al@openerp.com-20110924145258-16r9qi7hr3dip1jz

diff --cc openerp-server
Simple merge

diff --cc openerp/addons/base/__openerp__.py
Simple merge

diff --cc openerp/modules/loading.py
Simple merge

diff --cc openerp/modules/registry.py
Simple merge

diff --cc openerp/report/interface.py
Simple merge

diff --cc openerp/tools/config.py
Simple merge

diff --cc openerp/workflow/wkf_service.py
index c74a0ad,12fb5ee..a8d829a
--- 1/openerp/workflow/wkf_service.py
--- 2/openerp/workflow/wkf_service.py
+++ b/openerp/workflow/wkf_service.py
@@@ -27,8 -27,24 +27,18 @@@ import openerp.netsvc as netsv
  import openerp.pooler as pooler
  
  class workflow_service(netsvc.Service):
+     """
+     Sometimes you might want to fire a signal or re-evaluate the current state
+     of a workflow using the service's API. You can access the workflow services
+     using:
+ 
+     >>> import netsvc
+     >>> wf_service = netsvc.LocalService("workflow")
+ 
+     """
 -    def __init__(self, name='workflow', audience='*'):
 -        netsvc.Service.__init__(self, name, audience)
 -        self.exportMethod(self.trg_write)
 -        self.exportMethod(self.trg_delete)
 -        self.exportMethod(self.trg_create)
 -        self.exportMethod(self.trg_validate)
 -        self.exportMethod(self.trg_redirect)
 -        self.exportMethod(self.trg_trigger)
 -        self.exportMethod(self.clear_cache)
++
 +    def __init__(self, name='workflow'):
 +        netsvc.Service.__init__(self, name)
          self.wkf_on_create_cache={}
  
      def clear_cache(self, cr, uid):