[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 16 Nov 2010 05:45:15 +0000 (11:15 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Tue, 16 Nov 2010 05:45:15 +0000 (11:15 +0530)
bzr revid: ksa@tinyerp.co.in-20101116054515-jlbovcgl4eopg2uw


Trivial merge