[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 12 Jul 2012 09:44:40 +0000 (11:44 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 12 Jul 2012 09:44:40 +0000 (11:44 +0200)
commit7ccb648390b0b7ed5cf0276e0fe6b724acb87dff
tree0b03caca47aba393bbe64e16990d014bd18023d7
parentd47a272822e4c5cd9ed1ea5d85d4d1ecdbd0c913
parentb0b5a5988f613350d16d50d09adc9c12eb15022a
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120712094440-2yrgficztzvb6q0f