[MERGE]Merge main branch upto 1447.
authorKunal Chavda (OpenERP) <kch@tinyerp.com>
Fri, 11 Nov 2011 12:24:29 +0000 (17:54 +0530)
committerKunal Chavda (OpenERP) <kch@tinyerp.com>
Fri, 11 Nov 2011 12:24:29 +0000 (17:54 +0530)
bzr revid: kch@tinyerp.com-20111111122429-rls90rz836r4z012


Trivial merge