[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Mon, 20 Aug 2012 14:51:53 +0000 (16:51 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Mon, 20 Aug 2012 14:51:53 +0000 (16:51 +0200)
commit9e394de8ae45ace5a3b17bb26cbc2c67e27de3f6
tree8075040a7b677c5aa16d6120bf75adf1ba68a405
parentaa5a055c6d10d60b70abdd365eb6e52f51764555
parentf313d35c858708859c807b6a2854bbadad678682
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120820145153-fa8movasb860sjff