[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 29 Sep 2011 05:18:22 +0000 (10:48 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Thu, 29 Sep 2011 05:18:22 +0000 (10:48 +0530)
bzr revid: aag@tinyerp.com-20110929051822-ryuc49nnl99ai910


Trivial merge