[MERGE] opw 17578
authorRaphael Collet <rco@openerp.com>
Mon, 17 Oct 2011 09:02:45 +0000 (11:02 +0200)
committerRaphael Collet <rco@openerp.com>
Mon, 17 Oct 2011 09:02:45 +0000 (11:02 +0200)
commit76971523e39d5f5bdd02b209cea8cafbbe05d123
treef7b2d027db273873c06d16203296f7d30a4ecb84
parentbf10d462c6a603490afb9e765580c97c83242f73
parent4529b116d61e329781d0614d9f446217edb9d2af
[MERGE] opw 17578

bzr revid: rco@openerp.com-20111017090245-lgrud8q2uo94tf41