[MERGE] merge with main branch
authorKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 05:23:24 +0000 (10:53 +0530)
committerKuldeep Joshi (OpenERP) <kjo@tinyerp.com>
Thu, 7 Jun 2012 05:23:24 +0000 (10:53 +0530)
bzr revid: kjo@tinyerp.com-20120607052324-v5ie48mx5dng0409


Trivial merge