[MERGE]latest trunk-proto61.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Wed, 25 May 2011 05:52:20 +0000 (11:22 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Wed, 25 May 2011 05:52:20 +0000 (11:22 +0530)
bzr revid: kch@tinyerp.com-20110525055220-efvm850pbkjalouc

1  2 
addons/base/static/src/js/base.js
addons/base/static/src/xml/base.xml

Simple merge
Simple merge