[MERGE]merge with main branch.
authorVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 9 Jan 2012 12:59:18 +0000 (18:29 +0530)
committerVidhin Mehta (OpenERP) <vme@tinyerp.com>
Mon, 9 Jan 2012 12:59:18 +0000 (18:29 +0530)
bzr revid: vme@tinyerp.com-20120109125918-mc7iaj1z1acxjrv1


Trivial merge