[MERGE]
authorStephane Wirtel <stephane@openerp.com>
Thu, 25 Mar 2010 14:27:21 +0000 (15:27 +0100)
committerStephane Wirtel <stephane@openerp.com>
Thu, 25 Mar 2010 14:27:21 +0000 (15:27 +0100)
commitff6de06ea48f4e44e6442b73cc7855088d3be567
tree847528ff76b16af3325ae7194d89e222a8c74315
parent462d736bbaaef64d8d2d53e0597ce66f1bbde2c1
parent00d4c63bd25f3d9806d7e29f583c8a3801c5ad1b
[MERGE]

bzr revid: stephane@openerp.com-20100325142721-12mhmjjh75q6ki2p