[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/osv-memory-wizards

bzr revid: rpa@tinyerp.com-20100311064633-67tfletn0zsw45yy

diff --cc addons/account/__terp__.py
Simple merge

diff --cc addons/crm/__terp__.py
index 7f6d8c7,80f0eef..96cdfa0
--- 1/addons/crm/__terp__.py
--- 2/addons/crm/__terp__.py
+++ b/addons/crm/__terp__.py
@@@ -61,29 -61,18 +61,28 @@@ between mails and Open ERP."""
      ], 
  
      'update_xml': [
 +        'wizard/crm_phonecall2phonecall.xml',
 +        'wizard/lead_to_partner_view.xml',
 +        'wizard/phonecall2meeting.xml',
 +        'wizard/phonecall2partner_view.xml',
 +        'wizard/phonecall2opportunity.xml',
 +        'wizard/opportunity2partner_view.xml',
 +        'wizard/opportunity2meeting.xml',
 +        'wizard/opportunity2phonecall.xml',
 +        'wizard/lead2opportunity.xml',
          'crm_wizard.xml', 
 -        'crm_view.xml', 
 +        'crm_view.xml',
 +         
          'crm_action_rule_view.xml', 
 -        'crm_lead_wizard.xml', 
 +        #'crm_lead_wizard.xml', 
          'crm_lead_view.xml', 
          'crm_lead_menu.xml', 
-         'crm_meeting_wizard.xml', 
          'crm_meeting_view.xml', 
          'crm_meeting_menu.xml', 
 -        'crm_phonecall_wizard.xml', 
 +        #'crm_phonecall_wizard.xml', 
          'crm_phonecall_view.xml', 
          'crm_phonecall_menu.xml',         
 -        'crm_opportunity_wizard.xml', 
 +        #'crm_opportunity_wizard.xml', 
          'crm_opportunity_view.xml', 
          'crm_opportunity_menu.xml', 
          'crm_fund_view.xml',