Merge proposals dependent on lp://staging/~openerp-brazil-team/openerp.pt-br-localiz/openerp.pt-br-localiz-trunk

1. openerp.pt-br-localiz-trunk
2. Dependent merge proposals