[MERGE]upstream
authorDenis Ledoux <dle@openerp.com>
Fri, 14 Jun 2013 12:28:54 +0000 (14:28 +0200)
committerDenis Ledoux <dle@openerp.com>
Fri, 14 Jun 2013 12:28:54 +0000 (14:28 +0200)
commit23d40e2345f4a18445e432a8486e9117099b35a7
tree45c4c9f9849080fc622e0518eecdf6ffbbc51290
parentd0aff42a30a338e8552f66d5a525ad77d3d4c9dd
parent484148e8e4040830a4eebf0949100c1cc2a4a011
[MERGE]upstream

bzr revid: dle@openerp.com-20130614122854-le6s0u679k8kn547