[MERGE] Merge with lp:openobject-addons
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 10 Feb 2011 04:51:43 +0000 (10:21 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 10 Feb 2011 04:51:43 +0000 (10:21 +0530)
bzr revid: sbh@tinyerp.com-20110208044605-wr3b2icgj1cazq1z
bzr revid: sbh@tinyerp.com-20110210045143-lds9k7r4cbp37xtc


Trivial merge