[MERGE] merged with trunk development branch.

bzr revid: hmo@tinyerp.com-20111213074129-0frej7vvaefubybe

diff --cc addons/marketing_campaign/__openerp__.py
index 5f2155a,44a2f1e..44646a0
--- 1/addons/marketing_campaign/__openerp__.py
--- 2/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@@ -58,13 -58,8 +58,12 @@@ Note: If you need demo data, you can in
          "security/ir.model.access.csv"
      ],
      'demo_xml': [
 +        'marketing_campaign_demo.xml',
      ],
 +    'test': [
 +        'test/marketing_campaign.yml',
 +     ],
      'installable': True,
-     'application': True,
      'active': False,
      'certificate' : '00421723279617928365',
      'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],