[MERGE] latest trunk
authorAntonin Bourguignon <abo@openerp.com>
Tue, 19 Jun 2012 14:37:52 +0000 (16:37 +0200)
committerAntonin Bourguignon <abo@openerp.com>
Tue, 19 Jun 2012 14:37:52 +0000 (16:37 +0200)
commitda0fcfc19fa512e1e1eb2bdaa78a2507abc82a7a
tree61b33a46e4cd33ccf0cf4b50987cf68a3efb30ff
parent3ebcb195d0ba17f0348dd3f23083b4358738ae3a
parentc9c27a2432dca8a23656659b07dbe77382307500
[MERGE] latest trunk

bzr revid: abo@openerp.com-20120619143752-29v97mmr7xcttj9o