[MERGE] Merge with team1 branch
authorsbh (Open ERP) <sbh@tinyerp.com>
Thu, 11 Nov 2010 05:57:08 +0000 (11:27 +0530)
committersbh (Open ERP) <sbh@tinyerp.com>
Thu, 11 Nov 2010 05:57:08 +0000 (11:27 +0530)
bzr revid: sbh@tinyerp.com-20101111055708-6uehnyn8c4u2s412


Trivial merge