[Merge] : branch merged with lp:openobject-addons
authormso <mso@mso>
Wed, 19 May 2010 05:06:46 +0000 (10:36 +0530)
committermso <mso@mso>
Wed, 19 May 2010 05:06:46 +0000 (10:36 +0530)
commit67133e1dc40682ec11cf387c4ae576ee6d0752f7
treed416083797d9cbc51f162fe9731aa791ad91e149
parent5f520738214952594d00c1d57f4b5773392143c4
parentc99638ab487563e5166f897714200532dc0afca9
[Merge] : branch merged with lp:openobject-addons

bzr revid: mso@mso-20100519050646-4sw308695vzaexed