[MERGE] merge trunk-social-tde branch.
authorBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Tue, 13 Mar 2012 04:57:01 +0000 (10:27 +0530)
committerBhumi Thakkar (Open ERP) <bth@tinyerp.com>
Tue, 13 Mar 2012 04:57:01 +0000 (10:27 +0530)
commit55d5cf9dfa39419cb29ea4ff07948b0f6316a457
tree6d6a32e8d2ce22c3a3a400297536e9788afa7637
parent3f6550a82bbd734f5c467a4c9aed2c44d3afdfa4
parent543d76dca3638c664b19cdd3943eec476c3ca061
[MERGE] merge trunk-social-tde branch.

bzr revid: bth@tinyerp.com-20120313045701-ga77z60i02ufxs8u