[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Thu, 1 Aug 2013 12:49:10 +0000 (14:49 +0200)
committerChristophe Matthieu <chm@openerp.com>
Thu, 1 Aug 2013 12:49:10 +0000 (14:49 +0200)
bzr revid: chm@openerp.com-20130801124910-88hspvafqzkgvctt


Trivial merge