[MERGE] forward port of branch saas-1 up to revid 4887... ...branch saas-1 up to revid 4887 chs@openerp.com-20130612153934-qyp6pb3bc4za4taf bzr revid: chs@openerp.com-20130613172414-dln3g4j0ykcwaa02 bzr revid: chs@openerp.com-20130613173900-xl7rh321nnw2b04b