[MERGE] merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 9 Mar 2012 11:39:45 +0000 (17:09 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Fri, 9 Mar 2012 11:39:45 +0000 (17:09 +0530)
bzr revid: bth@tinyerp.com-20120309113945-gspwo230ou76n4yr


Trivial merge