Merge with lp:~openerp-dev/openobject-addons/trunk-social-tde
authorRGA(OpenERP) <>
Thu, 22 Mar 2012 13:28:35 +0000 (18:58 +0530)
committerRGA(OpenERP) <>
Thu, 22 Mar 2012 13:28:35 +0000 (18:58 +0530)
bzr revid: rgaopenerp-20120322132835-3ok74724e6efk66a


Trivial merge