[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:22:21 +0000 (10:52 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 31 Jul 2012 05:22:21 +0000 (10:52 +0530)
bzr revid: apa@tinyerp.com-20120731052221-0kzi8y7an3fwzn8d


Trivial merge