[MERGE] lp:768994
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 27 Apr 2011 07:19:45 +0000 (09:19 +0200)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Wed, 27 Apr 2011 07:19:45 +0000 (09:19 +0200)
bzr revid: qdp-launchpad@openerp.com-20110427071945-x9rq3f8ljiuaxhfg


Trivial merge