[MERGE] merge with team1 branch
authorSbh (OpenERP) <sbh@tinyerp.com>
Thu, 9 Dec 2010 06:08:01 +0000 (11:38 +0530)
committerSbh (OpenERP) <sbh@tinyerp.com>
Thu, 9 Dec 2010 06:08:01 +0000 (11:38 +0530)
bzr revid: sbh@tinyerp.com-20101207113112-rpr4it217zjlien9
bzr revid: sbh@tinyerp.com-20101209060801-b8hbfp1xxt7an206


Trivial merge