merge upstream
authorChristophe Simonis <chs@openerp.com>
Fri, 27 Jul 2012 13:09:47 +0000 (15:09 +0200)
committerChristophe Simonis <chs@openerp.com>
Fri, 27 Jul 2012 13:09:47 +0000 (15:09 +0200)
bzr revid: chs@openerp.com-20120727130947-gkmbu7ykf02c952s


Trivial merge