[MERGE]
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:35:27 +0000 (16:05 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Thu, 28 Jun 2012 10:35:27 +0000 (16:05 +0530)
bzr revid: dbr@tinyerp.com-20120628051105-b1hmr2gy5fcfcqh0
bzr revid: apa@tinyerp.com-20120628103527-hn4qc4wbppcjm703


Trivial merge