[MERGE] lp:~openerp-commiter/openobject-addons/trunk-red-button-addcancelbutton-rma