[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 4 Apr 2012 10:43:35 +0000 (16:13 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Wed, 4 Apr 2012 10:43:35 +0000 (16:13 +0530)
bzr revid: apa@tinyerp.com-20120404104335-ds320kymruq0njja


Trivial merge