[MERGE] merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 16 Mar 2012 09:48:15 +0000 (15:18 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 16 Mar 2012 09:48:15 +0000 (15:18 +0530)
bzr revid: bth@tinyerp.com-20120316094815-8lkrm1dlmpk4lbkz


Trivial merge