[MERGE] merge with main addons branch
authorAntony Lesuisse <al@openerp.com>
Tue, 14 Sep 2010 18:08:07 +0000 (18:08 +0000)
committerAntony Lesuisse <al@openerp.com>
Tue, 14 Sep 2010 18:08:07 +0000 (18:08 +0000)
bzr revid: al@openerp.com-20100914180807-w78qjzpkq7i5lk22


Trivial merge