[MERGE] merge with main addons
authorPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 9 Apr 2012 11:32:22 +0000 (17:02 +0530)
committerPurnendu Singh (OpenERP) <psi@tinyerp.com>
Mon, 9 Apr 2012 11:32:22 +0000 (17:02 +0530)
commit3adb3e1501ba3d856c9f192d05051da580d6ae37
treed8986c4158d1aeb15b33c2ff821ee8fb24f93f06
parent0634b27f7cc94b27207db236686a4c7351703e5d
parentd60ca9a5fa158244cacfa16a5bd4f6715fd592e6
[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120409113222-j3zrjx0xunqwc2vu