[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 4 Dec 2012 16:26:21 +0000 (17:26 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 4 Dec 2012 16:26:21 +0000 (17:26 +0100)
commit82e892bc536c3a8426b78e9a1962002a4be675c3
tree56e1e0bf1804b9ed431d83eeeccfe8a0d086b255
parent43e8cda76d5fadb432bc14c792cc3223e548af21
parent524694747b1a80e881ebdc1f33e40236ac45f8d0
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121204162621-uqvqssyjoa3qsxn3