[MERGE] merged with trunk development branch
authorHarry (OpenERP) <hmo@tinyerp.com>
Mon, 26 Dec 2011 06:11:28 +0000 (11:41 +0530)
committerHarry (OpenERP) <hmo@tinyerp.com>
Mon, 26 Dec 2011 06:11:28 +0000 (11:41 +0530)
bzr revid: hmo@tinyerp.com-20111226061128-j7ezxdzicr2qxsgc


Trivial merge