[MERGE]:trunk
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 6 Sep 2012 11:18:50 +0000 (16:48 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 6 Sep 2012 11:18:50 +0000 (16:48 +0530)
bzr revid: apa@tinyerp.com-20120906111850-glanaf1uyfv0f2qb


Trivial merge