[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20100428050233-4muruzwlrdyulgxq

diff --cc addons/olap/__openerp__.py
index bdca188,bdca188..3a9f8f2
--- 1/addons/olap/__openerp__.py
--- 2/addons/olap/__openerp__.py
+++ b/addons/olap/__openerp__.py
@@@ -46,8 -46,8 +46,8 @@@
          "data/olap_security.xml",
          'security/ir.model.access.csv'
      ],
--    "demo_xml" : ["data/olap_demo.xml",
--                  "test/olap_test00.yml"],
++    "demo_xml" : ["data/olap_demo.xml"],
++    "test" : ['test/olap_test00.yml'],
      "active": False,
      "installable": True
  }

diff --cc addons/wiki/__openerp__.py
index 8dd7779,8dd7779..04f9a93
--- 1/addons/wiki/__openerp__.py
--- 2/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@@ -42,8 -42,8 +42,8 @@@
          'data/wiki_main.xml',
          'security/ir.model.access.csv'
      ],
--    'demo_xml': ['test/wiki_test00.yml'],
--  #  'test': ['test/wiki_test00.yml'],
++    'demo_xml': [],
++    'test': ['test/wiki_test00.yml'],
      'installable': True,
      'active': False,
      'certificate': '0086363630317',