Merge proposals dependent on lp://staging/~savoirfairelinux-openerp/openerp-hr/hr_employee_phone_extension

1. hr_employee_phone_extension
2. Dependent merge proposals