[MERGE]: Merged with latest trunk-addons
authorRucha (Open ERP) <rpa@tinyerp.com>
Thu, 8 Nov 2012 06:12:39 +0000 (11:42 +0530)
committerRucha (Open ERP) <rpa@tinyerp.com>
Thu, 8 Nov 2012 06:12:39 +0000 (11:42 +0530)
commit4faf290a64472e251cfd51b736ba0e6f377d6a70
treec5df0802e98e5594303ac38fc4f84208f7259ce1
parentaddd2dbf61804939e29bec296f67f9b848a68597
parent1a8ef8657b2e84df951872bb7c814c129f2591dc
[MERGE]: Merged with latest trunk-addons

bzr revid: rpa@tinyerp.com-20121108061239-y61mpuo0yvmpdzt5