[Merge]
authorVir (Open ERP) <vir@tinyerp.com>
Thu, 16 Sep 2010 04:42:20 +0000 (10:12 +0530)
committerVir (Open ERP) <vir@tinyerp.com>
Thu, 16 Sep 2010 04:42:20 +0000 (10:12 +0530)
bzr revid: vir@tinyerp.com-20100913095609-lpvaem22onbub325
bzr revid: vir@tinyerp.com-20100915043759-um560kpvxgrjls9s
bzr revid: vir@tinyerp.com-20100916044220-ot7i50ampczg74zc

1  2 
bin/addons/base/base_update.xml
bin/addons/base/res/res_user.py

Simple merge
Simple merge