[MERGE] from trunk
authorChristophe Matthieu <chm@openerp.com>
Wed, 10 Jul 2013 15:13:56 +0000 (17:13 +0200)
committerChristophe Matthieu <chm@openerp.com>
Wed, 10 Jul 2013 15:13:56 +0000 (17:13 +0200)
bzr revid: chm@openerp.com-20130710151356-b5prp1zqlgd8lz19


Trivial merge