[MERGE] branch merged with lp:openobject-addons
authorMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 30 Sep 2011 05:55:35 +0000 (11:25 +0530)
committerMeera Trambadia (OpenERP) <mtr@tinyerp.com>
Fri, 30 Sep 2011 05:55:35 +0000 (11:25 +0530)
bzr revid: mtr@tinyerp.com-20110930055535-fn2r3vw7gex5pbp1


Trivial merge