[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Thu, 2 Aug 2012 23:47:14 +0000 (01:47 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Thu, 2 Aug 2012 23:47:14 +0000 (01:47 +0200)
commit7ac449b8047fbc92bf2207ed644cf2bfac5def95
tree3157b231720d584665ca85b753de9cdc75226e65
parentb929725a321733403e6f2ef0bd616289a09db187
parentef26faf0a52ff74a6c58f60719bc9cb2a59114e5
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120802234714-838rukd4ky0i1ikk