[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Jul 2012 05:28:09 +0000 (10:58 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 27 Jul 2012 05:28:09 +0000 (10:58 +0530)
bzr revid: apa@tinyerp.com-20120727052809-oezzaxn0qikgtkli


Trivial merge