[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
authoratp (Open ERP) <atp@tinyerp.co.in>
Thu, 27 May 2010 05:34:25 +0000 (11:04 +0530)
committeratp (Open ERP) <atp@tinyerp.co.in>
Thu, 27 May 2010 05:34:25 +0000 (11:04 +0530)
commit8e1d4d1946c03f48f32fd47975f3c8c19a32d717
tree4c619833053c7d9205d8451eb3774e8336c16f2d
parent0b2bf2d16ede1f4d51f0c9371030013c95acefc2
parentf2404834221799662de3c593525ba3624d0d3202
[MERGE]: merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons3

bzr revid: atp@tinyerp.co.in-20100527053425-ombfy3edopdxuwtb