[FIX] last merge
bzr revid: rco@openerp.com-20120628145821-brxl5tpyrjg91wnl
This commit is contained in:
parent
2963e31ebf
commit
5b71d65450
bzr revid: rco@openerp.com-20120628145821-brxl5tpyrjg91wnl