[MERGE] Merged trunk.
authorJiten (OpenERP) <jra@tinyerp.com>
Mon, 17 Sep 2012 05:41:40 +0000 (11:11 +0530)
committerJiten (OpenERP) <jra@tinyerp.com>
Mon, 17 Sep 2012 05:41:40 +0000 (11:11 +0530)
commitad01f6342dec3c69b1399ebf126d7c499f6a1d9d
tree1014b1b95b0d1439a81fa913e8226fbe98b1ab2e
parent8ad2786b5c025aed1170c92dd41a5870c0328aa8
parentcd644106f30d303738fdd0a04b9b15e5e4a33bbf
[MERGE] Merged trunk.

bzr revid: jra@tinyerp.com-20120917054140-oqthlws82kwoyhvn