[MERGE] latest trunk
authorOlivier Dony <odo@openerp.com>
Fri, 16 Dec 2011 15:56:24 +0000 (16:56 +0100)
committerOlivier Dony <odo@openerp.com>
Fri, 16 Dec 2011 15:56:24 +0000 (16:56 +0100)
bzr revid: odo@openerp.com-20111216155624-3nvdsaurjsdo44mx


Trivial merge