[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:29:04 +0000 (10:59 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Tue, 24 Jul 2012 05:29:04 +0000 (10:59 +0530)
bzr revid: apa@tinyerp.com-20120724052904-8o1jxzyu54q2ge9r


Trivial merge