[Merge] Merge with main addons.
authorDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:28:51 +0000 (09:58 +0530)
committerDivyesh Makwana (Open ERP) <mdi@tinyerp.com>
Thu, 5 Jul 2012 04:28:51 +0000 (09:58 +0530)
commitd70ca96b856cfd53ffcc7cd37b30e2581c46ee7e
treef1b4a0fdd28d18ab4cbb73e2a8c1827849787859
parent3c2e1a3dc98d990b498e9700d8de26068d8afe05
parent7caadaccccfb4f27fc4812806b19d3845b6810ad
[Merge] Merge with main addons.

bzr revid: mdi@tinyerp.com-20120705042851-okp58xkfv6x8qvmp