[MERGE] merge with main addons
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 4 Jun 2012 05:11:08 +0000 (10:41 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 4 Jun 2012 05:11:08 +0000 (10:41 +0530)
commit153a5f5b572a3c00cca225e27a2fade160dcbb32
tree8f9fae8d9bec2c546b6e0301617a5b2143b5e47d
parent6d69d32e202a46df3a52690a3ca4f8da240161bc
parent37e59e65b393034b4cc3fe79521be9525b650960
[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120604051108-humf11rf604h3sme