[MERGE] Merge with lp:openobject-addons
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 06:05:00 +0000 (11:35 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Tue, 12 Jun 2012 06:05:00 +0000 (11:35 +0530)
bzr revid: kjo@tinyerp.com-20120612060500-kh1rj7qy2whj34yu


Trivial merge