[MERGE] from trunk
authorOlivier Dony <odo@openerp.com>
Fri, 1 Apr 2011 12:54:00 +0000 (14:54 +0200)
committerOlivier Dony <odo@openerp.com>
Fri, 1 Apr 2011 12:54:00 +0000 (14:54 +0200)
bzr revid: odo@openerp.com-20110401125400-39nk9gayvlseh1jc


Trivial merge