[MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
authorrpa (Open ERP) <rpa@tinyerp.com>
Fri, 10 Dec 2010 12:31:03 +0000 (18:01 +0530)
committerrpa (Open ERP) <rpa@tinyerp.com>
Fri, 10 Dec 2010 12:31:03 +0000 (18:01 +0530)
bzr revid: rpa@tinyerp.com-20101210123103-lptm79jxvthes4p4


Trivial merge