[MERGE] Sync with 7.0
authorThibault Delavallée <tde@openerp.com>
Wed, 2 Jan 2013 10:42:27 +0000 (11:42 +0100)
committerThibault Delavallée <tde@openerp.com>
Wed, 2 Jan 2013 10:42:27 +0000 (11:42 +0100)
commit192de5ed466368204a810876504e3e5a2c7c4896
tree54d9a341c800db491af617dcc501093ac7a6bcc5
parent57eb08beab177d67a49b6d50b9be0927192d86de
parent8a90401507c7e02deb5fd8c7627c66a2f331c546
[MERGE] Sync with 7.0

bzr revid: tde@openerp.com-20130102104227-acry0w4s032uda1g