[MERGE] Merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Mon, 12 Mar 2012 05:31:20 +0000 (11:01 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Mon, 12 Mar 2012 05:31:20 +0000 (11:01 +0530)
bzr revid: bth@tinyerp.com-20120312053120-h5kyj97h8avrrqed


Trivial merge