[MERGE]trunk-addons21_hr_imp-ssu
authordle@openerp.com <>
Fri, 14 Dec 2012 12:38:02 +0000 (13:38 +0100)
committerdle@openerp.com <>
Fri, 14 Dec 2012 12:38:02 +0000 (13:38 +0100)
bzr revid: dle@openerp.com-20121214123802-cxax5cqcnw672h2p


Trivial merge