[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Thu, 8 Nov 2012 11:14:17 +0000 (12:14 +0100)
committerChristophe Matthieu <chm@openerp.com>
Thu, 8 Nov 2012 11:14:17 +0000 (12:14 +0100)
bzr revid: chm@openerp.com-20121108111417-ds9eyxd32tihpuxs


Trivial merge