[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Mon, 19 Nov 2012 17:01:16 +0000 (18:01 +0100)
committerOlivier Dony <odo@openerp.com>
Mon, 19 Nov 2012 17:01:16 +0000 (18:01 +0100)
commita670e79f8e426081141827f8e1fa4e2dbfd050fe
treece962b554fdfb6c745fb2ca7d0280bc08cbf43ea
parent1a8acb73b39494b726f04fc559e45f27d851d5b6
parent9180d9702b11fe0fd6d228037826ccbaa9a31fc5
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121119170116-x6fusrmmmkquvgfh