[MERGE]Latest trunk
authorDenis Ledoux dle@openerp.com <>
Mon, 19 Nov 2012 12:43:51 +0000 (13:43 +0100)
committerDenis Ledoux dle@openerp.com <>
Mon, 19 Nov 2012 12:43:51 +0000 (13:43 +0100)
bzr revid: dle@openerp.com-20121119124351-5zd1lr7mlaeix1l2


Trivial merge