[MERGE]Latest trunk
authorDenis Ledoux dle@openerp.com <>
Wed, 21 Nov 2012 17:32:06 +0000 (18:32 +0100)
committerDenis Ledoux dle@openerp.com <>
Wed, 21 Nov 2012 17:32:06 +0000 (18:32 +0100)
bzr revid: dle@openerp.com-20121121173206-xu8ha9umq5216eib


Trivial merge