[MERGE] sync w/ latest trunk
authorOlivier Dony <odo@openerp.com>
Sat, 24 Sep 2011 02:05:51 +0000 (04:05 +0200)
committerOlivier Dony <odo@openerp.com>
Sat, 24 Sep 2011 02:05:51 +0000 (04:05 +0200)
bzr revid: odo@openerp.com-20110924020551-bv6rw8hj8p5din4n


Trivial merge