[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:59:51 +0000 (16:29 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Apr 2012 10:59:51 +0000 (16:29 +0530)
bzr revid: apa@tinyerp.com-20120427105951-04lnerscmffpnmt9


Trivial merge