[MERGE]: Merge with lp:openobject-trunk-dev-addons2
authoraag (OpenERP) <aag@tinyerp.co.in>
Mon, 31 Jan 2011 04:57:44 +0000 (10:27 +0530)
committeraag (OpenERP) <aag@tinyerp.co.in>
Mon, 31 Jan 2011 04:57:44 +0000 (10:27 +0530)
bzr revid: aag@tinyerp.co.in-20110131045744-o8ju43l1aufxlk3e


Trivial merge