[MERGE]
authorniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
committerniv-openerp <nicolas.vanhoren@openerp.com>
Wed, 27 Apr 2011 14:37:23 +0000 (16:37 +0200)
commit63bed71ac37cfbece9d490ac858c15c2c138bdf6
tree33b7f60fc600fd8e66d84c13e05784dc1c9214ff
parentf81fdfccc76580616435861decfe53dfe519ada7
parentef88a2a5c1cebffbc24fcee54dce6cfcffa52c26
[MERGE]

bzr revid: nicolas.vanhoren@openerp.com-20110427143723-1po27vnufecyg4nq
addons/base/static/src/js/data.js
addons/base/static/src/js/form.js
addons/base/static/src/xml/base.xml