[MERGE] Latest trunk
authorOlivier Dony <odo@openerp.com>
Mon, 18 Jun 2012 08:51:29 +0000 (10:51 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 18 Jun 2012 08:51:29 +0000 (10:51 +0200)
commit81410d7ae44a45ef4ff8a6c5e10c92b5eb7f45e9
tree8a49383c5ee45c1c737a0f0e9876b341113cb7e4
parente33611033f21088966800bf79290305482c0830c
parent10291e4673788e5459e62a6d5f1bd39769da049f
[MERGE] Latest trunk

bzr revid: odo@openerp.com-20120618085129-rne9lrj4oa1ass66