[MERGE] merged bugfix 723176
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 25 Feb 2011 15:08:50 +0000 (16:08 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 25 Feb 2011 15:08:50 +0000 (16:08 +0100)
bzr revid: qdp-launchpad@openerp.com-20110225150850-vsky0v20x627c70v


Trivial merge