[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Fri, 24 Aug 2012 12:44:26 +0000 (14:44 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Fri, 24 Aug 2012 12:44:26 +0000 (14:44 +0200)
commitaf60c27ea714a23ffa15b08150e51b3c7ffeb161
tree69f89017bfb934a11027df0139cdeca92f94530a
parentb24789a9653ac162ff64a38f3fdea1e1093677a8
parent0b464f088272417a0f71b7778ea31c4661e73214
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120824124426-wzvo50olkspnvy5a