merge
authorDhara (OpenERP) <>
Thu, 22 Sep 2011 23:09:27 +0000 (16:09 -0700)
committerDhara (OpenERP) <>
Thu, 22 Sep 2011 23:09:27 +0000 (16:09 -0700)
commit2d2c7519c41fddf4451cfe2b418e9f2ed30a06d0
tree663166d0d3d799b51710e5fcfe5b8986d3b384f5
parent6da1004cf514289103af8fb8a51790aa4d3388c1
parent1edacff49735a8f2c3cd4f8eee4aab368bdbb650
merge

bzr revid: dhara_openerp-20110922230927-ksntf42ipcqcfvrq
openerp/addons/base/base_data.xml