[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:30:52 +0000 (11:00 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 19 Jul 2012 05:30:52 +0000 (11:00 +0530)
bzr revid: apa@tinyerp.com-20120718050106-98v8qw9n0e531npw
bzr revid: apa@tinyerp.com-20120719053052-b6xeid85m7f6ugi0


Trivial merge