[MERGE] Sync with trunk.
authorGilles Major <gim@openerp.com>
Tue, 12 Mar 2013 09:31:27 +0000 (10:31 +0100)
committerGilles Major <gim@openerp.com>
Tue, 12 Mar 2013 09:31:27 +0000 (10:31 +0100)
commita64b6e16d902324cc8030ae2dfad980f13eedb34
tree20dcb1c18508da31da27ff7d091cbd29b8c22774
parent3e3818ddc0b1ab4c0a60e0f0ecfc2ce456ecc77c
parentd2b66d7f249b27d20c55cbbf6f9cd090175ebb1e
[MERGE] Sync with trunk.

bzr revid: tde@openerp.com-20130308141810-f7pfzqgreb9pemba
bzr revid: gim@openerp.com-20130312093127-g3ueh5puatx1m6o2