[Merge] with : lp:~openerp-dev/openobject-server/trunk-v62_config
authorDBR (OpenERP) <dbr@tinyerp.com>
Fri, 27 Apr 2012 09:02:49 +0000 (14:32 +0530)
committerDBR (OpenERP) <dbr@tinyerp.com>
Fri, 27 Apr 2012 09:02:49 +0000 (14:32 +0530)
bzr revid: dbr@tinyerp.com-20120427090249-zbjfnokxo31lo2rm


Trivial merge