[MERGE] Sync with trunk
authorOlivier Dony <odo@openerp.com>
Mon, 15 Oct 2012 13:10:45 +0000 (15:10 +0200)
committerOlivier Dony <odo@openerp.com>
Mon, 15 Oct 2012 13:10:45 +0000 (15:10 +0200)
commit825746d0872bb05e16a52938852fc6444e61480b
tree32b4dd140c7fb12c3e7fe657811b4f92d480863e
parent5f2459422335c966567370eadce3281adff729f7
parent7f23ad5de563eacfcae958d0011637800b097d4a
[MERGE] Sync with trunk

bzr revid: odo@openerp.com-20121015131045-y0ixvr5fv38qly6m