[MERGE] Merge from main addons
authorMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Mon, 23 Jul 2012 09:01:08 +0000 (14:31 +0530)
committerMustufa Rangwala (OpenERP) <mra@tinyerp.com>
Mon, 23 Jul 2012 09:01:08 +0000 (14:31 +0530)
commitef38540e3c38dcc4733d764754aed2f300eff424
tree78ed6ffcc81add7d0eeb6bc6b8ec0a0e88de4520
parentbc9533ab82ec482a308a2964f718917c570d6894
parent61f361bfee1ae021aedef0ebbf3c91d15083cf1a
[MERGE] Merge from main addons

bzr revid: mra@tinyerp.com-20120723090108-tdzfr7t02mrx9or4