restored unittest import
Merge branch 'master' of https://github.com/irmen/Pyro4
Merge branch 'master' of https://github.com/irmen/Pyro4