[MERGE] sync with latest trunk
authorOlivier Dony <odo@openerp.com>
Thu, 22 Dec 2011 20:23:56 +0000 (21:23 +0100)
committerOlivier Dony <odo@openerp.com>
Thu, 22 Dec 2011 20:23:56 +0000 (21:23 +0100)
bzr revid: odo@openerp.com-20111222202356-6u22um5kc9yuusxc


Trivial merge