[Merge] : branch merged with lp:openobject-addons
authormso <mso@mso>
Wed, 5 May 2010 10:23:56 +0000 (15:53 +0530)
committermso <mso@mso>
Wed, 5 May 2010 10:23:56 +0000 (15:53 +0530)
bzr revid: mso@mso-20100505102356-s2gsq3uk7km1edd3


Trivial merge