Was done as a manual merge (cherry-pick) to avoid breaking file history when not really needed, and when there are many similar files. bzr revid: odo@openerp.com-20121218023714-921hju9esklavpx9
Olivier Dony