[MERGE] Sync with trunk.
authorThibault Delavallée <tde@openerp.com>
Tue, 26 Feb 2013 15:52:52 +0000 (16:52 +0100)
committerThibault Delavallée <tde@openerp.com>
Tue, 26 Feb 2013 15:52:52 +0000 (16:52 +0100)
commit4680851ab48ec633600b76c2dd320c643c9e6ae1
tree808d9bdd0cda7757023716ebf76f680227cbdb8e
parent0aaca4daa92bcaba2a981de11c136689fe80209c
parent108d5f1d6cc1efc8b846a06702589e0abb54ea6d
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130226155252-vi618lsx000a1i01