[MERGE]
authorStephane Wirtel <stw@openerp.com>
Thu, 15 Sep 2011 08:59:25 +0000 (10:59 +0200)
committerStephane Wirtel <stw@openerp.com>
Thu, 15 Sep 2011 08:59:25 +0000 (10:59 +0200)
commit26047415fc41fadbdeb31bc99346f4f7f343fd70
tree838c34181523fd1345b7c63ede5554a6f708b69c
parent81e6707b916deb767df9cba285eb08aaeafa7365
parentdfc46d1f15cbb1d642616791a1a24baf4747d14f
[MERGE]

bzr revid: stw@openerp.com-20110915085925-hs86f0w3ptyynxjh