[MERGE] misc merge fp-addons
authorFabien Pinckaers <fp@openerp.com>
Thu, 25 Oct 2012 18:05:19 +0000 (20:05 +0200)
committerFabien Pinckaers <fp@openerp.com>
Thu, 25 Oct 2012 18:05:19 +0000 (20:05 +0200)
bzr revid: fp@openerp.com-20121025180519-24c6liikb37ho4zx


Trivial merge