[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authorksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 24 Nov 2010 05:43:21 +0000 (11:13 +0530)
committerksa (Open ERP) <ksa@tinyerp.co.in>
Wed, 24 Nov 2010 05:43:21 +0000 (11:13 +0530)
commit2ead39022e5742f5939be2cbf36d06494eb7e570
treef278f7d392b215779c2e4770930bbd55df2bf9b5
parentf4ebea2992d16e862ac75a0e5709a6ebac4163bf
parent432d5ceeaea7c01e21af7c313ddc1086b3d43d72
[MERGE]: Merge with lp:openobject-trunk-dev-addons2

bzr revid: ksa@tinyerp.co.in-20101124054321-yiflew26iq311v3h
addons/account/report/common_report_header.py
addons/product/product.py