[MERGE]merge with latest trunk
authorCedric Snauwaert <csn@openerp.com>
Fri, 9 Nov 2012 13:59:28 +0000 (14:59 +0100)
committerCedric Snauwaert <csn@openerp.com>
Fri, 9 Nov 2012 13:59:28 +0000 (14:59 +0100)
bzr revid: csn@openerp.com-20121109135928-45rir9rehmvaf6tp


Trivial merge