[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:23:37 +0000 (10:53 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Mon, 19 Mar 2012 05:23:37 +0000 (10:53 +0530)
bzr revid: apa@tinyerp.com-20120319052337-6k0kzcszg81q4gzq


Trivial merge