merge upstream
authorChristophe Simonis <chs@openerp.com>
Wed, 7 Nov 2012 17:29:56 +0000 (18:29 +0100)
committerChristophe Simonis <chs@openerp.com>
Wed, 7 Nov 2012 17:29:56 +0000 (18:29 +0100)
bzr revid: chs@openerp.com-20121107172956-yq0di9lgw3x18ht2


Trivial merge