[MERGE] from trunk
authorXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 08:44:31 +0000 (09:44 +0100)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 08:44:31 +0000 (09:44 +0100)
bzr revid: xmo@openerp.com-20121129084431-1xo5z47cor2zzmr8


Trivial merge