[MERGE] merge with main addons branch
authorAntony Lesuisse <al@openerp.com>
Wed, 15 Sep 2010 14:24:06 +0000 (14:24 +0000)
committerAntony Lesuisse <al@openerp.com>
Wed, 15 Sep 2010 14:24:06 +0000 (14:24 +0000)
bzr revid: al@openerp.com-20100915142406-vcdenfm6xnlpmj7h


Trivial merge