[REBASE]: rebase of module developed by rga@openerp.com, vip@openerp.com, ptr@openerp.com, ara@openerp.com and mga@openerp.com