[MERGE]: Merge with lp:openobject-addons
authorAtik Agewan (OpenERP) <aag@tinyerp.com>
Tue, 27 Sep 2011 13:30:27 +0000 (19:00 +0530)
committerAtik Agewan (OpenERP) <aag@tinyerp.com>
Tue, 27 Sep 2011 13:30:27 +0000 (19:00 +0530)
bzr revid: aag@tinyerp.com-20110927133027-piibojotn7m175fd


Trivial merge