merge upstream
authorChristophe Simonis <chs@openerp.com>
Thu, 11 Apr 2013 15:53:51 +0000 (17:53 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 11 Apr 2013 15:53:51 +0000 (17:53 +0200)
bzr revid: chs@openerp.com-20130411155351-y286kg2uoazzop6o


Trivial merge