[MERGE] from trunk-salesteams-up-chm
authorChristophe Matthieu <chm@openerp.com>
Wed, 27 Mar 2013 15:09:07 +0000 (16:09 +0100)
committerChristophe Matthieu <chm@openerp.com>
Wed, 27 Mar 2013 15:09:07 +0000 (16:09 +0100)
bzr revid: chm@openerp.com-20130327150907-z3n87y9tzsmn5hh9


Trivial merge