[MERGE]merge with latest addons
authorCedric Snauwaert <csn@openerp.com>
Thu, 13 Dec 2012 08:38:37 +0000 (09:38 +0100)
committerCedric Snauwaert <csn@openerp.com>
Thu, 13 Dec 2012 08:38:37 +0000 (09:38 +0100)
bzr revid: csn@openerp.com-20121213083837-wsr74knpgeqou3mv


Trivial merge