[MERGE] branch merge with lp:~openerp-dev/openobject-addons/trunk-v62_config
authorJagdish Panchal (Open ERP) <jap@tinyerp.com>
Thu, 5 Apr 2012 06:34:11 +0000 (12:04 +0530)
committerJagdish Panchal (Open ERP) <jap@tinyerp.com>
Thu, 5 Apr 2012 06:34:11 +0000 (12:04 +0530)
bzr revid: jap@tinyerp.com-20120405063411-jq3ibjndygk1py56


Trivial merge