[MERGE] Sync with 7.0, to have last fixes that were tested inside this branch.
authorThibault Delavallée <tde@openerp.com>
Thu, 3 Jan 2013 15:22:27 +0000 (16:22 +0100)
committerThibault Delavallée <tde@openerp.com>
Thu, 3 Jan 2013 15:22:27 +0000 (16:22 +0100)
commit044c5a9a32be33a113d50604d0e70079dc9ab889
tree02c23be474a3511b415d5cee9045b7d1ad29b04f
parent4aceb1d1be2db602eb1878d31ed8974a3514068c
parent8a893127423fedb8ad39f67e6a54a7d5a28b8e54
[MERGE] Sync with 7.0, to have last fixes that were tested inside this branch.

bzr revid: tde@openerp.com-20130103120144-530ndclf0bbcwb50
bzr revid: tde@openerp.com-20130103152227-twdztf4awjit3vwc