[MERGE]: Merge with lp:openobject-addons
authorMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 10:31:29 +0000 (16:01 +0530)
committerMayur Maheshwari (OpenERP) <mma@tinyerp.com>
Thu, 22 Sep 2011 10:31:29 +0000 (16:01 +0530)
bzr revid: mma@tinyerp.com-20110922103129-tzi4x1952w46s2am


Trivial merge