[MERGE] merged from trunk main addons branch
authorvra <vra@tinyerp.com>
Thu, 13 May 2010 11:25:42 +0000 (16:55 +0530)
committervra <vra@tinyerp.com>
Thu, 13 May 2010 11:25:42 +0000 (16:55 +0530)
commitf0c786b4563265e4ab72664295366a5858e1dea7
treeb0d036163e9dbb67672a59ef61cceb93f46718f1
parentd25b0d8a2cf7711bab3d3ea55ac817aadc2bbbf9
parente2f6088ea705d2ba61da0f3628af90bc438c178f
[MERGE] merged from trunk main addons branch

bzr revid: vra@tinyerp.com-20100513112542-wl4m3gpq5cqi82sw