[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Thu, 23 Dec 2010 05:20:44 +0000 (10:50 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Thu, 23 Dec 2010 05:20:44 +0000 (10:50 +0530)
bzr revid: aag@tinyerp.co.in-20101223052044-98gzte8l9nm15n0n


Trivial merge