[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Mon, 15 Oct 2012 13:10:45 +0000 (15:10 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 15 Oct 2012 13:10:45 +0000 (15:10 +0200)
bzr revid: odo@openerp.com-20121015131045-y0ixvr5fv38qly6m


Trivial merge