[MERGE] Merge with trunk
authorFabien Meghazi <fme@openerp.com>
Mon, 30 Apr 2012 07:46:44 +0000 (09:46 +0200)
committerFabien Meghazi <fme@openerp.com>
Mon, 30 Apr 2012 07:46:44 +0000 (09:46 +0200)
commit60548a42e9607da2d9d89da0914d1bbbc6c488c9
tree00eef57f93025a33eaf9af658884e6f24d9fa4ac
parentb9aa66428427d1db09e6e56148f515aa5c3da568
parentcbf1c12698f911cf2b16d63eb963ea96260c9f23
[MERGE] Merge with trunk

bzr revid: fme@openerp.com-20120430074644-b3fh4hmoef0t205p
openerp/addons/base/base_update.xml