[MERGE]Merge with trunk upto revision no 743.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Mon, 8 Aug 2011 12:13:14 +0000 (17:43 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Mon, 8 Aug 2011 12:13:14 +0000 (17:43 +0530)
commitc31b7f3e93123f36354aeff1c20ac7aba892531d
treec90ae1dd89b10cf6030ca4f32441669bc92df652
parentdd2e69fcc16daec9141935c9d3bdf650280012cd
parent7a41bdf2328cb66b019f1509d22408e2155c172a
[MERGE]Merge with trunk upto revision no 743.

bzr revid: kch@tinyerp.com-20110808121314-armvhe41si1nshsp
addons/base/__openerp__.py
addons/base/controllers/main.py
addons/base/static/src/js/boot.js
addons/base/static/src/js/views.js
addons/base/static/src/xml/base.xml