[MRG] merge with main branch
authorTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:44:06 +0000 (11:14 +0530)
committerTurkesh Patel (Open ERP) <tpa@tinyerp.com>
Mon, 14 May 2012 05:44:06 +0000 (11:14 +0530)
bzr revid: tpa@tinyerp.com-20120514054406-e6bb0uuy6kmj925k


Trivial merge