merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 8 Nov 2012 16:46:52 +0000 (17:46 +0100)
committerChristophe Simonis <chs@openerp.com>
Thu, 8 Nov 2012 16:46:52 +0000 (17:46 +0100)
bzr revid: chs@openerp.com-20121108164652-bpsb0h2dfla62jqo


Trivial merge