[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:30:00 +0000 (14:00 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 20 Jul 2012 08:30:00 +0000 (14:00 +0530)
bzr revid: apa@tinyerp.com-20120720083000-pzf6udwq54jnvphz


Trivial merge