[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 29 Jun 2012 12:56:01 +0000 (14:56 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 29 Jun 2012 12:56:01 +0000 (14:56 +0200)
commit94539758525d56b3fbf35a93c87db511bf165327
treef7c579d29636e585448830d121014cb79a3904f5
parente0e7597aa037206d34912420cf77c3a1681ab130
parent37601079a987b0b20f22fff8963d22b1440b78b4
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120629125601-jctwxucbo2jng73j