[MERGE] merge with main branch
authorAntony Lesuisse <al@openerp.com>
Wed, 15 Sep 2010 14:38:30 +0000 (14:38 +0000)
committerAntony Lesuisse <al@openerp.com>
Wed, 15 Sep 2010 14:38:30 +0000 (14:38 +0000)
bzr revid: al@openerp.com-20100915143830-smcj3ht04cirur9p

1  2 
addons/account/report/invoice.rml

Simple merge