[MERGE]: Merge with trunk addons
authorrpa (Open ERP) <rpa@tinyerp.com>
Mon, 15 Mar 2010 05:39:26 +0000 (11:09 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Mon, 15 Mar 2010 05:39:26 +0000 (11:09 +0530)
commitd4e351bbb4115eff85a76e016086779651cb2691
tree59da81e223191365af12fa0bf8b51e6a72d8d2cf
parent080297c2dc1c07e5d72c787251bd78bb9dd19827
parent81d69bc2523fe482df695b9f0a441c368d821bb0
[MERGE]: Merge with trunk addons

bzr revid: rpa@tinyerp.com-20100315053926-j8qckvf105nscy5f