[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Tue, 11 Dec 2012 17:01:19 +0000 (18:01 +0100)
committerOlivier Dony <odo@openerp.com>
Tue, 11 Dec 2012 17:01:19 +0000 (18:01 +0100)
commit5b56a77add9a4f92b5cf2f84d419caff9b0dc4e6
treee1f7f576fa8944d2d72e64876e7c42327e5d8879
parentf5fd0fc0815190b3e80854a8ad0afa7a5d1271c4
parent33ae7185620cec8e621f7cec592db82c6b9e12fe
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121211170119-5spf2iqzl89kphnk