[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)
commitef772eaea3e3bfe4463b1f0c429992430b18b7f6
tree10b3cc0c9bc24fcf53a5e41105e56d6251558a89
parente2067d9ceae5d3c65fb139f0fe023d89353be995
parentf8daa47a0a5a34e302d00a92beb282072055c2a1
[MERGE]

bzr revid: dbr@tinyerp.com-20120628051105-b1hmr2gy5fcfcqh0
bzr revid: apa@tinyerp.com-20120628103527-hn4qc4wbppcjm703