[MERGE] lp:~openerp-dev/openobject-addons/6.0-opw-4292-stw
authorStephane Wirtel <stephane@openerp.com>
Thu, 10 Mar 2011 10:34:27 +0000 (11:34 +0100)
committerStephane Wirtel <stephane@openerp.com>
Thu, 10 Mar 2011 10:34:27 +0000 (11:34 +0100)
commit126fec64ff387cd842e19aef1ed435fc47b5b1aa
treeab39bd21db752ab0dacdca3568c92a1d2343755f
parent13521c719b0ad9dc27fdcbf245241e33588e6375
parentd9cabb1b5b5f37ce5803d9ed7c78c3ed602b5fee
[MERGE] lp:~openerp-dev/openobject-addons/6.0-opw-4292-stw

bzr revid: stephane@openerp.com-20110310103427-89ao0vf5h3x801da