[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)
commit1e809366c37191370ca6ef7fdfaadc541129a1bc
tree557bc311b2c90e5e093b6993c6a53ad90905c19e
parentf90e630dabad6d2fac43cfb34324cb5705e73446
parent48499f2e0a97f8c84cf3d45755309995a5ff5445
[MERGE]Merge main branch upto 1447.

bzr revid: kch@tinyerp.com-20111111122429-rls90rz836r4z012