[MERGE]merge with main addons
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 17 Apr 2012 05:47:02 +0000 (11:17 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Tue, 17 Apr 2012 05:47:02 +0000 (11:17 +0530)
bzr revid: psi@tinyerp.com-20120417054702-wc8m91g7v5k4oa8g


Trivial merge